diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7665f8e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-objs/*
-!objs/ndk_*
-.pc/
-.vscode/
-modules/media-framework/
-modules/nginx-srt-module/
-modules/nginx-vod-module/
-Makefile
-*.orig
-*.txt
\ No newline at end of file
diff --git a/auto/make b/auto/make
index fad0844..25ee3fb 100644
--- a/auto/make
+++ b/auto/make
@@ -2,11 +2,6 @@
 # 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"
 
@@ -179,7 +174,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_last2 \`dirname $ngx_src\``"
+    ngx_obj="addon/`basename \`dirname $ngx_src\``"
 
     test -d $NGX_OBJS/$ngx_obj || mkdir -p $NGX_OBJS/$ngx_obj
 
@@ -418,7 +413,7 @@ if test -n "$NGX_ADDON_SRCS"; then
 
     for ngx_src in $NGX_ADDON_SRCS
     do
-        ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
+        ngx_obj="addon/`basename \`dirname $ngx_src\``"
 
         ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \
             | sed -e "s/\//$ngx_regex_dirsep/g"`
@@ -581,7 +576,7 @@ END
                 ngx_obj=$ngx_src
                 ;;
             *)
-                ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
+                ngx_obj="addon/`basename \`dirname $ngx_src\``"
                 mkdir -p $NGX_OBJS/$ngx_obj
                 ngx_obj="$ngx_obj/`basename $ngx_src`"
                 ;;
@@ -643,7 +638,7 @@ END
                 ngx_obj=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"`
                 ;;
             *)
-                ngx_obj="addon/`basename_last2 \`dirname $ngx_source\``"
+                ngx_obj="addon/`basename \`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
deleted file mode 100755
index 4131c20..0000000
--- a/configure.docker.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/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.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.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.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.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 \
-    --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-secure-token-module
\ No newline at end of file
diff --git a/configure.sh b/configure.sh
deleted file mode 100755
index 3d780fe..0000000
--- a/configure.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/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.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.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.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.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 \
-    --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-secure-token-module
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 8ec0edd..11e38f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,10 @@
-nginx (1.26.3-3) unstable; urgency=medium
+nginx (1.26.3-3) UNRELEASED; urgency=medium
 
-  [ Jan Mojžíš ]
-  * d/changelog: fix whitespace in 1.26.3-2 record
+  * d/changelog: fix whitespace
   * 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>  Thu, 15 May 2025 15:31:38 +0200
+ -- 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 cb759f6..a63fa0f 100644
--- a/debian/nginx-common.nginx.service
+++ b/debian/nginx-common.nginx.service
@@ -15,7 +15,6 @@ 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
diff --git a/modules/PLACEHOLDER b/modules/PLACEHOLDER
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/nginx-secure-token-module b/modules/nginx-secure-token-module
deleted file mode 160000
index 24f7b99..0000000
--- a/modules/nginx-secure-token-module
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 24f7b99d9b665e11c92e585d6645ed6f45f7d310
diff --git a/modules/nginx-stream-preread-str-module b/modules/nginx-stream-preread-str-module
deleted file mode 160000
index 7326626..0000000
--- a/modules/nginx-stream-preread-str-module
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7326626fce5d6ec31ac892377e0a734e503d40e6
diff --git a/modules/njs b/modules/njs
deleted file mode 160000
index 4fd3ff9..0000000
--- a/modules/njs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4fd3ff98e413ede57c88456cf84b116a8382061a
diff --git a/modules/quickjs b/modules/quickjs
deleted file mode 160000
index 1fdc768..0000000
--- a/modules/quickjs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1fdc768fdc8571300755cdd3e4654ce99c0255ce
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
deleted file mode 100644
index 57d2b8a..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.travis.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index a9eabff..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/CONTRIBUTING.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
deleted file mode 100644
index db3aca7..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 80428e9..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/README.md
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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
deleted file mode 100644
index 42162a6..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/config
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
deleted file mode 100644
index c7021b7..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/changelog
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index 6e5752d..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/control
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 2ecfff5..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/copyright
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index 38c12c1..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/gbp.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index 5fcd39d..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-filter.install
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100644
index dd4a44e..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-static.install
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100644
index 09735a7..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/0001-Fix-Vary-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
deleted file mode 100644
index dfd7340..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index de69689..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/control
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 16ac356..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/filter
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index bce1fbc..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/static
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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
deleted file mode 100644
index 30627c6..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 08b8983..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 9c27fc7..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/config
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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
deleted file mode 100644
index 592b767..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/ngx_http_brotli_filter_module.c
+++ /dev/null
@@ -1,770 +0,0 @@
-/*
- * 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
deleted file mode 100755
index 9f69164..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-before-test.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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
deleted file mode 100755
index 2fa01d6..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-compile.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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
deleted file mode 100755
index 1db8d15..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-test.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/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
deleted file mode 100644
index 93957f9..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 0f2c791..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test_h2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index de07d1c..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/config
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
deleted file mode 100644
index 44f0cb0..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/ngx_http_brotli_static_module.c
+++ /dev/null
@@ -1,323 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 3c009b3..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.astylerc
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
deleted file mode 100755
index 75209eb..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.format.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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
deleted file mode 100644
index 9b27d9f..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.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
deleted file mode 100644
index 3714921..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.travis.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index 7495742..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/CHANGES
+++ /dev/null
@@ -1,103 +0,0 @@
-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
deleted file mode 100644
index 0047538..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/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/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
deleted file mode 100644
index e3d92b4..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/README.md
+++ /dev/null
@@ -1,283 +0,0 @@
-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
deleted file mode 100644
index b900680..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/config
+++ /dev/null
@@ -1,31 +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
-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
deleted file mode 100644
index 9e03744..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/changelog
+++ /dev/null
@@ -1,74 +0,0 @@
-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
deleted file mode 100644
index 3936731..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/control
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index a0ef36d..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/copyright
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 97cd209..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/gbp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index dd4e1a3..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/control
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 1574080..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/purgetest
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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
deleted file mode 100644
index ca2631c..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 11bd9bf..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 251d3fe..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/ngx_cache_purge_module.c
+++ /dev/null
@@ -1,2163 +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 <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
deleted file mode 100644
index fefe9b8..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/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: 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
deleted file mode 100644
index b9da04b..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/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: 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
deleted file mode 100644
index 4c7e19f..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/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: 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
deleted file mode 100644
index 08e3e1e..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/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: 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
deleted file mode 100644
index c8d71d9..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy3.t
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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
deleted file mode 100644
index e4d2f30..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy4.t
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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
deleted file mode 100644
index 816c3ff..0000000
--- a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/resptype1.t
+++ /dev/null
@@ -1,245 +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_';
-
-    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
deleted file mode 100644
index 6fe6f35..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.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
deleted file mode 100644
index a9948e4..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/.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/modules_deb/libnginx-mod-http-echo-0.63/.travis.yml b/modules_deb/libnginx-mod-http-echo-0.63/.travis.yml
deleted file mode 100644
index 7dda358..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-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
deleted file mode 100644
index 6feffbf..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/README.markdown b/modules_deb/libnginx-mod-http-echo-0.63/README.markdown
deleted file mode 100644
index a6b25e3..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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.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
deleted file mode 100644
index 4bf0f00..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/debian/changelog b/modules_deb/libnginx-mod-http-echo-0.63/debian/changelog
deleted file mode 100644
index 1e6c923..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/changelog
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index e7cfde3..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/control
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 061d047..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/copyright
+++ /dev/null
@@ -1,71 +0,0 @@
-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
deleted file mode 100644
index b25e244..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/fix.scanned.copyright
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index d9f01a6..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/gbp.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b95c6ff..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/control
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index c66b2dc..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/helloworld
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/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
deleted file mode 100644
index 81ba6ec..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 55febdb..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index a92d7a7..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index f5789f5..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 896f1ed..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 689b52e..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index ea5115d..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index a4a2b54..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 49592f4..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 120c8b0..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.c
+++ /dev/null
@@ -1,433 +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;
-            }
-        }
-
-        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
deleted file mode 100644
index afc0666..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 820e504..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.c
+++ /dev/null
@@ -1,182 +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;
-
-    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
deleted file mode 100644
index 6bc0e03..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 8d736d7..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index ce0a305..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 7dd3683..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index aa5730b..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index c96fa5a..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 8bb70c3..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 0980d58..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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 = 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
deleted file mode 100644
index 61c0a04..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index e2777ee..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index b6e7ff3..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index fed0587..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index d620d09..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 138a510..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 8b24e02..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 6137607..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 0bdc6cc..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 44c4c72..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 1513184..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 82b6725..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 712524d..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/echo.t b/modules_deb/libnginx-mod-http-echo-0.63/t/echo.t
deleted file mode 100644
index b181259..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/exec.t b/modules_deb/libnginx-mod-http-echo-0.63/t/exec.t
deleted file mode 100644
index b7c1308..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 2835270..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 266a701..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/gzip.t b/modules_deb/libnginx-mod-http-echo-0.63/t/gzip.t
deleted file mode 100644
index 61eb4f6..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/if.t b/modules_deb/libnginx-mod-http-echo-0.63/t/if.t
deleted file mode 100644
index 054ec43..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/incr.t b/modules_deb/libnginx-mod-http-echo-0.63/t/incr.t
deleted file mode 100644
index 8ad6d98..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 3494516..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/location.t b/modules_deb/libnginx-mod-http-echo-0.63/t/location.t
deleted file mode 100644
index 48c851e..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/mixed.t b/modules_deb/libnginx-mod-http-echo-0.63/t/mixed.t
deleted file mode 100644
index abf2599..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index d467b2e..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index dd34da4..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/t/request-info.t
+++ /dev/null
@@ -1,870 +0,0 @@
-# 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
deleted file mode 100644
index f8e741e..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/status.t b/modules_deb/libnginx-mod-http-echo-0.63/t/status.t
deleted file mode 100644
index d97b084..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/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
deleted file mode 100644
index 882b368..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/subrequest.t b/modules_deb/libnginx-mod-http-echo-0.63/t/subrequest.t
deleted file mode 100644
index 6d965d0..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/t/unused.t b/modules_deb/libnginx-mod-http-echo-0.63/t/unused.t
deleted file mode 100644
index f3c6e9e..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/util/build.sh b/modules_deb/libnginx-mod-http-echo-0.63/util/build.sh
deleted file mode 100755
index 45949bb..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/util/wiki2pod.pl b/modules_deb/libnginx-mod-http-echo-0.63/util/wiki2pod.pl
deleted file mode 100644
index cdd33a2..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-echo-0.63/valgrind.suppress b/modules_deb/libnginx-mod-http-echo-0.63/valgrind.suppress
deleted file mode 100644
index 975415e..0000000
--- a/modules_deb/libnginx-mod-http-echo-0.63/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/modules_deb/libnginx-mod-http-geoip2-3.4/LICENSE b/modules_deb/libnginx-mod-http-geoip2-3.4/LICENSE
deleted file mode 100644
index fdc13a7..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/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/modules_deb/libnginx-mod-http-geoip2-3.4/README.md b/modules_deb/libnginx-mod-http-geoip2-3.4/README.md
deleted file mode 100644
index cea0d04..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/README.md
+++ /dev/null
@@ -1,153 +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/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
deleted file mode 100644
index 48bf15d..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/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/modules_deb/libnginx-mod-http-geoip2-3.4/debian/changelog b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/changelog
deleted file mode 100644
index 0c0f22e..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/changelog
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index 3ccc4e3..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/control
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index ab01158..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/copyright
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 38c12c1..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/gbp.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index 2692817..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-http-geoip2.install
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100644
index 9f45e96..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-stream-geoip2.install
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ca20b9f..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/control
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 5f50585..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 04e3a51..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 4b3461c..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/ngx_http_geoip2_module.c
+++ /dev/null
@@ -1,803 +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;
-#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
deleted file mode 100644
index eb59082..0000000
--- a/modules_deb/libnginx-mod-http-geoip2-3.4/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/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitattributes b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitattributes
deleted file mode 100644
index 6fe6f35..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.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
deleted file mode 100644
index 39c82fa..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.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/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
deleted file mode 100644
index 6b346a8..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.travis.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index c14f60a..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 6baea91..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/README.markdown
+++ /dev/null
@@ -1,538 +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.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
deleted file mode 100644
index 5707cc4..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 0fd56e3..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/changelog
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index a8ebd83..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/control
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 251922c..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/copyright
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index 97cd209..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/gbp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b95c6ff..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/control
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 6a2e85b..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/helloworld
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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
deleted file mode 100644
index 185ca21..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 426294e..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 13879af..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 0bb6fec..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 5f31ab4..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.h
+++ /dev/null
@@ -1,81 +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;
-    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
deleted file mode 100644
index 983be5b..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.c
+++ /dev/null
@@ -1,959 +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
-
-#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
deleted file mode 100644
index d2251da..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 2a95b5f..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.c
+++ /dev/null
@@ -1,814 +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
-
-    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
deleted file mode 100644
index c939507..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index e1f3636..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.c
+++ /dev/null
@@ -1,382 +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/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
deleted file mode 100644
index 6c4614b..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 2339401..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/bug.t
+++ /dev/null
@@ -1,416 +0,0 @@
-# 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
deleted file mode 100644
index 27b20af..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index febd306..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index f53e80f..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 3e5257b..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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
-[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
deleted file mode 100644
index da9a60d..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 01ae73f..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 11183db..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 47d65e3..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/sanity.t
+++ /dev/null
@@ -1,628 +0,0 @@
-# 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
deleted file mode 100644
index 9443eca..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index c51f91c..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100644
index 04c75c3..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/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
deleted file mode 100755
index 00a191f..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/util/build.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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
deleted file mode 100644
index d51de70..0000000
--- a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/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/modules_deb/libnginx-mod-http-memc-0.20/.gitattributes b/modules_deb/libnginx-mod-http-memc-0.20/.gitattributes
deleted file mode 100644
index 6fe6f35..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.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
deleted file mode 100644
index ed5f748..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/.gitignore
+++ /dev/null
@@ -1,54 +0,0 @@
-.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
deleted file mode 100644
index e695941..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/.travis.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index 7f82bd1..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/README.markdown
+++ /dev/null
@@ -1,813 +0,0 @@
-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
deleted file mode 100644
index 7e4bfd6..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/config
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 57faeca..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/changelog
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 3b34393..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/control
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index a2e9e2e..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/copyright
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index b25e244..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/fix.scanned.copyright
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index 97cd209..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/gbp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100755
index ec9b918..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/rules
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 3c57b8b..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/control
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index a194656..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/flush
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 1f4a243..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 81f077a..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 36e810e..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ddebug.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#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
deleted file mode 100644
index eeb61c1..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_common.rl
+++ /dev/null
@@ -1,44 +0,0 @@
-%%{
-    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
deleted file mode 100644
index 1e01b05..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_delete.rl
+++ /dev/null
@@ -1,17 +0,0 @@
-%%{
-    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
deleted file mode 100644
index 74c7288..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_flush_all.rl
+++ /dev/null
@@ -1,16 +0,0 @@
-%%{
-    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
deleted file mode 100644
index b4b13a5..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_incr_decr.rl
+++ /dev/null
@@ -1,20 +0,0 @@
-%%{
-    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
deleted file mode 100644
index 9526b77..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_stats.rl
+++ /dev/null
@@ -1,22 +0,0 @@
-%%{
-    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
deleted file mode 100644
index b64a441..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_storage.rl
+++ /dev/null
@@ -1,17 +0,0 @@
-%%{
-    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
deleted file mode 100644
index 3a85b59..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_version.rl
+++ /dev/null
@@ -1,19 +0,0 @@
-%%{
-    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
deleted file mode 100644
index 0236242..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.c
+++ /dev/null
@@ -1,612 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index cd63c4c..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#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
deleted file mode 100644
index 5b534d2..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.c
+++ /dev/null
@@ -1,404 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index bea4578..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 482a001..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.c
+++ /dev/null
@@ -1,571 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 10e74c6..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 5f702e7..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.c
+++ /dev/null
@@ -1,1914 +0,0 @@
-
-#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
deleted file mode 100644
index aec26dc..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 31f7c83..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.rl
+++ /dev/null
@@ -1,663 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index dd19643..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.c
+++ /dev/null
@@ -1,161 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index e83fbbb..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index a39260d..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/bugs.t
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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
deleted file mode 100644
index 327a0c7..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/cmd.t
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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
deleted file mode 100644
index a9a580c..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/core-bugs.t
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
deleted file mode 100644
index 9fccf37..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/delete.t
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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
deleted file mode 100644
index 1cda000..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/errors.t
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
deleted file mode 100644
index 8736de7..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/eval.t
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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
deleted file mode 100644
index 0a62190..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/exptime.t
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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
deleted file mode 100644
index aa2b29b..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/flags.t
+++ /dev/null
@@ -1,263 +0,0 @@
-# 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
deleted file mode 100644
index aeea8dc..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/flush-all.t
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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
deleted file mode 100644
index 89c5859..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/if.t
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
deleted file mode 100644
index 8412ec9..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/incr-decr.t
+++ /dev/null
@@ -1,292 +0,0 @@
-# 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
deleted file mode 100644
index e1292e6..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive.t
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
deleted file mode 100644
index b03f1e8..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/incr-decr.t
+++ /dev/null
@@ -1,306 +0,0 @@
-# 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
deleted file mode 100644
index 69c2116..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/storage.t
+++ /dev/null
@@ -1,749 +0,0 @@
-# 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
deleted file mode 100644
index f412b42..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/stats.t
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
deleted file mode 100644
index ee0706b..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/storage.t
+++ /dev/null
@@ -1,740 +0,0 @@
-# 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
deleted file mode 100644
index a50fcac..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/upstream.t
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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
deleted file mode 100644
index 4e7b2ae..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/used.t
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
deleted file mode 100644
index ae26ec8..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/t/version.t
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
deleted file mode 100755
index 7defa6e..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/util/build.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/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
deleted file mode 100755
index 6b1bda6..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/util/fix-clang-warnings
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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
deleted file mode 100755
index fd9c9d8..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/util/update-readme.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index cdd33a2..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/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/modules_deb/libnginx-mod-http-memc-0.20/valgrind.suppress b/modules_deb/libnginx-mod-http-memc-0.20/valgrind.suppress
deleted file mode 100644
index a10fd57..0000000
--- a/modules_deb/libnginx-mod-http-memc-0.20/valgrind.suppress
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-   <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
-}
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/.gitignore b/modules_deb/libnginx-mod-http-ndk-0.3.4/.gitignore
deleted file mode 100644
index 0fd79d0..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index e1a5221..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/modules_deb/libnginx-mod-http-ndk-0.3.4/README.md b/modules_deb/libnginx-mod-http-ndk-0.3.4/README.md
deleted file mode 100644
index d9d3972..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index f2c3371..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 04cd889..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 6d430bd..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/build b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/build
deleted file mode 100644
index feb84b3..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index f419bc3..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 284a5cb..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 752b533..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index f5352c3..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index f42206a..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index e7e8ff0..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index aa0f11c..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/header_files
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 7583cb9..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/headers
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index a179316..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index bbd6ec5..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index ee53474..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/prefixes
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index a583759..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 38743a6..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 1e3ba70..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 798e360..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 6a244c2..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/modules_deb/libnginx-mod-http-ndk-0.3.4/config b/modules_deb/libnginx-mod-http-ndk-0.3.4/config
deleted file mode 100644
index 8cb7ad0..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/changelog b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/changelog
deleted file mode 100644
index 93ab9b1..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/changelog
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index b5eec8e..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/control
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 50da8f9..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright
+++ /dev/null
@@ -1,155 +0,0 @@
-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
deleted file mode 100644
index 044c11d..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright-scan-patterns.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index b5e57b8..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/fix.scanned.copyright
+++ /dev/null
@@ -1 +0,0 @@
-! 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
deleted file mode 100644
index 97cd209..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/gbp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100644
index d9988f1..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index c7a20b4..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.install
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100644
index ec2f484..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.nginx
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 3908af6..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/mod-http-ndk.conf
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100755
index 42e9c85..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/rules
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ca20b9f..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/control
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 51ef420..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index e0b5b75..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 802eb1f..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 70978b1..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 6be5c0f..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 3685916..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 3ad485d..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/README b/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/README
deleted file mode 100644
index 22e2417..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index aa58f77..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 7a4daae..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index d5441fb..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/CHANGES b/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/CHANGES
deleted file mode 100644
index eaaef0b..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/LICENSE b/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/LICENSE
deleted file mode 100644
index 7074f57..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 4e0d518..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index c2db894..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 68e276f..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 4f7855f..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index d2e572f..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 7223950..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index cbbf60a..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index db8aaf1..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index ba4fdd4..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index ec1d6d8..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index bd5161f..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 4cbf843..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index ac899b4..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 16cacf9..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index d57040a..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index e08dfac..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.h
+++ /dev/null
@@ -1,53 +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     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
deleted file mode 100644
index c491f72..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index e6334ad..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 8b32713..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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_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
deleted file mode 100644
index eb93d1f..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 97681ff..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 4178d62..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 980641c..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 6956b17..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index e0251cc..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 883a6eb..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 4a07872..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index b295b18..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index dec3d41..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index a15e923..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 60728bb..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 6a9d1c5..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index e71c70e..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 36dca15..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 1dd9c22..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 7c43e14..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 0b7c266..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 22ba945..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index fbc789c..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 7ac1d99..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index c1efd86..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 4319b04..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 77ce9f8..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 2479aa2..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 388f873..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 5dcba97..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 7c2a965..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index ecd21c4..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 18a28f0..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 3a83a25..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 3786456..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index 19e90e8..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/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
deleted file mode 100644
index dac3880..0000000
--- a/modules_deb/libnginx-mod-http-ndk-0.3.4/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/modules_deb/libnginx-mod-http-set-misc-0.33/.gitattributes b/modules_deb/libnginx-mod-http-set-misc-0.33/.gitattributes
deleted file mode 100644
index 6fe6f35..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.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
deleted file mode 100644
index 7500112..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/.gitignore
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index a841a11..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/.travis.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index f7f4010..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/README.markdown
+++ /dev/null
@@ -1,1451 +0,0 @@
-<!---
-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
deleted file mode 100755
index 7bb00af..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/config
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index bb494f4..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/changelog
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 9223829..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/control
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index f77abc0..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index e195ac6..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright-scan-patterns.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index b25e244..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/fix.scanned.copyright
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index 38c12c1..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/gbp.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 9ecf806..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/control
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 6aee6f3..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/setifempty
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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
deleted file mode 100644
index fe767d2..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index b6d7cc0..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index aaa6fef..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ddebug.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#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
deleted file mode 100644
index c56c7ba..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.c
+++ /dev/null
@@ -1,263 +0,0 @@
-#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
deleted file mode 100644
index 68ca277..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#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
deleted file mode 100644
index 8666ad8..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#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
deleted file mode 100644
index 6594c77..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#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
deleted file mode 100644
index f1426ad..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#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
deleted file mode 100644
index 6ccf63b..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#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
deleted file mode 100644
index f4c80a1..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#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
deleted file mode 100644
index 5bf5168..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#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
deleted file mode 100644
index a09f8da..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#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
deleted file mode 100644
index b8564bd..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#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
deleted file mode 100644
index 59ad606..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#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
deleted file mode 100644
index db3a558..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#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
deleted file mode 100644
index 391dd35..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.c
+++ /dev/null
@@ -1,141 +0,0 @@
-#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
deleted file mode 100644
index 8b7caa7..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#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
deleted file mode 100644
index 6900650..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#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
deleted file mode 100644
index e8b77e0..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#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
deleted file mode 100644
index 139c0c7..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#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
deleted file mode 100644
index fe02ea4..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#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
deleted file mode 100644
index fa1c703..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#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
deleted file mode 100644
index 993431e..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#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
deleted file mode 100644
index 3b12b0e..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.c
+++ /dev/null
@@ -1,586 +0,0 @@
-#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
deleted file mode 100644
index 49b3c9e..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#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
deleted file mode 100644
index 4bed13c..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#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
deleted file mode 100644
index 1bf55e2..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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
deleted file mode 100644
index 8d78348..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.c
+++ /dev/null
@@ -1,382 +0,0 @@
-#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
deleted file mode 100644
index c631dd7..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#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
deleted file mode 100644
index c223633..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#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
deleted file mode 100644
index 88cffdc..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#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
deleted file mode 100644
index b83dee7..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.c
+++ /dev/null
@@ -1,113 +0,0 @@
-#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
deleted file mode 100644
index 429204c..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#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
deleted file mode 100644
index a07efe8..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#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
deleted file mode 100644
index d65129e..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#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
deleted file mode 100644
index 3ae1d0a..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.c
+++ /dev/null
@@ -1,184 +0,0 @@
-#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
deleted file mode 100644
index 59e9a93..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#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
deleted file mode 100644
index 2efa731..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/base32.t
+++ /dev/null
@@ -1,556 +0,0 @@
-# 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
deleted file mode 100644
index 9330cbf..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/base32_no_padding.t
+++ /dev/null
@@ -1,531 +0,0 @@
-# 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
deleted file mode 100644
index 5dd5af8..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/base64.t
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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
deleted file mode 100644
index fc71d59..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/base64url.t
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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
deleted file mode 100644
index d86e4a2..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/default-value.t
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
deleted file mode 100644
index 7cbd067..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/escape-uri.t
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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
deleted file mode 100644
index 9b0fc73..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/formatted-time.t
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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
deleted file mode 100644
index a9c884b..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/hash.t
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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
deleted file mode 100644
index fdebd15..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/hashed-upstream.t
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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
deleted file mode 100644
index ae28105..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/hex.t
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
deleted file mode 100644
index 5353eca..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/hmac.t
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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
deleted file mode 100644
index 7de0968..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/local-today.t
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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
deleted file mode 100644
index 8e15def..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-json.t
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
deleted file mode 100644
index bd81a87..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-sql.t
+++ /dev/null
@@ -1,195 +0,0 @@
-# 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
deleted file mode 100644
index 7f042bb..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/rand.t
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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
deleted file mode 100644
index 2982a71..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/rotate.t
+++ /dev/null
@@ -1,270 +0,0 @@
-# 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
deleted file mode 100644
index 1f0b4a3..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/secure-random.t
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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
deleted file mode 100644
index ad52b59..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/t/unescape-uri.t
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
deleted file mode 100755
index dc2bcb6..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/util/build.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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
deleted file mode 100644
index 470978e..0000000
--- a/modules_deb/libnginx-mod-http-set-misc-0.33/valgrind.suppress
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-   <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
deleted file mode 100644
index 6fe6f35..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.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
deleted file mode 100644
index 5e0cb97..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitignore
+++ /dev/null
@@ -1,79 +0,0 @@
-*.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
deleted file mode 100644
index 600cf7d..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/.travis.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-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
deleted file mode 100644
index 5f257fe..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/Changes
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index e880b9c..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/README.markdown
+++ /dev/null
@@ -1,1258 +0,0 @@
-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
deleted file mode 100644
index 11d21b5..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/config
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index 02239af..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/changelog
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index 31e4daa..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/control
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 90ae398..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/copyright
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index b25e244..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/fix.scanned.copyright
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index 38c12c1..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/gbp.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ca20b9f..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/control
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 1eb2a27..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 1ca8874..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/watch
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index a2c6808..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/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, "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
deleted file mode 100644
index 9d3e649..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.c
+++ /dev/null
@@ -1,470 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 3a30e35..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 7bbad4e..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.c
+++ /dev/null
@@ -1,623 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 50c4b87..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.h
+++ /dev/null
@@ -1,152 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 2802df2..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.c
+++ /dev/null
@@ -1,359 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 5951c92..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index d03a2b6..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.c
+++ /dev/null
@@ -1,675 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 08aaf56..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index bfa1eaa..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.c
+++ /dev/null
@@ -1,1296 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index d9650d5..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 16b1f4f..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.c
+++ /dev/null
@@ -1,180 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index 151561d..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * 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
deleted file mode 100644
index b611e6c..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/000_init.t
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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
deleted file mode 100644
index d22c527..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/access.t
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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
deleted file mode 100644
index e7c046f..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/bugs.t
+++ /dev/null
@@ -1,668 +0,0 @@
-# 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
deleted file mode 100644
index b652ee6..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/conditional-get.t
+++ /dev/null
@@ -1,302 +0,0 @@
-# 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
deleted file mode 100644
index 14a78ba..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-length.t
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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
deleted file mode 100644
index 5e2b912..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-type.t
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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
deleted file mode 100644
index 4f0e90e..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/disk.t
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
deleted file mode 100644
index 5ff11eb..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-main.t
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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
deleted file mode 100644
index 7b56d12..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-sub.t
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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
deleted file mode 100644
index cc0d64c..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/empty-resp.t
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
deleted file mode 100644
index 5076774..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/err-page.t
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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
deleted file mode 100644
index bc62570..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/etag.t
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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
deleted file mode 100644
index c109463..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/eval.t
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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
deleted file mode 100644
index f257d9d..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expire-var.t
+++ /dev/null
@@ -1,592 +0,0 @@
-# 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
deleted file mode 100644
index 7c5bf03..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expires.t
+++ /dev/null
@@ -1,377 +0,0 @@
-# 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
deleted file mode 100644
index ca5c9c8..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-header.t
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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
deleted file mode 100644
index 3564325..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-skip.t
+++ /dev/null
@@ -1,528 +0,0 @@
-# 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
deleted file mode 100644
index d1aa7c0..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/gzip.t
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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
deleted file mode 100644
index af9cccc..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/header-buf-size.t
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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
deleted file mode 100644
index 66056d0..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/main-req.t
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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
deleted file mode 100644
index 9baa442..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/max-age.t
+++ /dev/null
@@ -1,305 +0,0 @@
-# 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
deleted file mode 100644
index 9a57b38..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/methods.t
+++ /dev/null
@@ -1,389 +0,0 @@
-# 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
deleted file mode 100644
index 40c99f6..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-cache.t
+++ /dev/null
@@ -1,309 +0,0 @@
-# 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
deleted file mode 100644
index 91973b2..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-store.t
+++ /dev/null
@@ -1,305 +0,0 @@
-# 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
deleted file mode 100644
index ccc00c4..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/postgres-main.t
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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
deleted file mode 100644
index 281dd76..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/private.t
+++ /dev/null
@@ -1,528 +0,0 @@
-# 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
deleted file mode 100644
index f3e6a31..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/proxy.t
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
deleted file mode 100644
index cc3c0f9..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/ranges.t
+++ /dev/null
@@ -1,410 +0,0 @@
-# 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
deleted file mode 100644
index 8af2ff0..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/redis.t
+++ /dev/null
@@ -1,246 +0,0 @@
-# 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
deleted file mode 100644
index 9dd97c8..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/req-cache-control.t
+++ /dev/null
@@ -1,394 +0,0 @@
-# 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
deleted file mode 100644
index f4cca71..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/satisfy.t
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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
deleted file mode 100644
index 97be58c..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/static.t
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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
deleted file mode 100644
index f5b3704..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/status.t
+++ /dev/null
@@ -1,723 +0,0 @@
-# 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
deleted file mode 100644
index 47262bd..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-hide-headers.t
+++ /dev/null
@@ -1,389 +0,0 @@
-# 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
deleted file mode 100644
index 8a9cd85..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-max-size.t
+++ /dev/null
@@ -1,356 +0,0 @@
-# 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
deleted file mode 100644
index 4361ae7..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-pass-headers.t
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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
deleted file mode 100644
index 13fdae2..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-skip.t
+++ /dev/null
@@ -1,434 +0,0 @@
-# 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
deleted file mode 100644
index f0dd6c7..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/sub-req.t
+++ /dev/null
@@ -1,448 +0,0 @@
-# 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
deleted file mode 100644
index 9357658..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/timeout.t
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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
deleted file mode 100644
index 9b4088f..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/unused.t
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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
deleted file mode 100755
index f28bac0..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/util/build.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/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
deleted file mode 100644
index 769d9d0..0000000
--- a/modules_deb/libnginx-mod-http-srcache-filter-0.33/valgrind.suppress
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-   <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
deleted file mode 100644
index b8a7ef1..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/modules_deb/libnginx-mod-http-subs-filter-0.6.4/README b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/README
deleted file mode 100644
index 1d32e05..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/modules_deb/libnginx-mod-http-subs-filter-0.6.4/config b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/config
deleted file mode 100644
index f1de029..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/config
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 0187588..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/changelog
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index b11de7a..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/control
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 03e9e31..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/copyright
+++ /dev/null
@@ -1,116 +0,0 @@
-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
deleted file mode 100644
index 38c12c1..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/gbp.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index f1ca5c5..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0001-Feature-nginx-dynamic-module-support.patch
+++ /dev/null
@@ -1,36 +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: 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
deleted file mode 100644
index 7887569..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0002-check-content-encoding-header-more-carefully.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index b01993b..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0003-PCRE2-support-added.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 7316931..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ca20b9f..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/control
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index d3ab623..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index b4c56bf..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 6a158a2..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 28c6810..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index b707f45..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 04834f8..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/ngx_http_subs_filter_module.c
+++ /dev/null
@@ -1,1302 +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_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
deleted file mode 100644
index b9ff21b..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 60b90ea..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 74caf9c..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index bc3d172..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index d3662c9..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 276409a..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 093cb7a..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 90cc979..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 4c71003..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 3b01e09..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index e222ac1..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 3139a63..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 1f724a7..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 7b10f7a..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 8609584..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index d7b116b..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 14961dc..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index de793c1..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 9e98a6a..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 0a1408e..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 53f6c85..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 833c00a..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index bcfcf19..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index ad26c5d..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 7ae6d29..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 725125c..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 4e39a11..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 32e1d88..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100755
index 3716b92..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100755
index 81498d5..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 88970a6..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 34904fc..0000000
--- a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/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/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
deleted file mode 100644
index 775ba29..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/.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/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
deleted file mode 100644
index 18802e1..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/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/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
deleted file mode 100644
index d8d478b..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/config
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index b43207d..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/changelog
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index 12c9b1f..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/control
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 7a26e54..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/copyright
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 38c12c1..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/gbp.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index 708caa0..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/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/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
deleted file mode 100644
index 0e00466..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/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/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
deleted file mode 100644
index c154daa..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/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/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
deleted file mode 100644
index f8e5439..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ca20b9f..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/control
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 0589425..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 494c265..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/watch
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 60a6de1..0000000
--- a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/ngx_http_upstream_fair_module.c
+++ /dev/null
@@ -1,1354 +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) {
-        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
deleted file mode 100644
index aed1f30..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/README.md b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/README.md
deleted file mode 100644
index 5a97a1e..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/README.md
+++ /dev/null
@@ -1,1745 +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.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
deleted file mode 100644
index 551ed8c..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/changelog.txt
+++ /dev/null
@@ -1,595 +0,0 @@
-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
deleted file mode 100644
index fdf0e34..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/config b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/config
deleted file mode 100644
index afc42d3..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/config
+++ /dev/null
@@ -1,170 +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/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
deleted file mode 100644
index d1282f8..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/changelog
+++ /dev/null
@@ -1,81 +0,0 @@
-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
deleted file mode 100644
index ab68216..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/control
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index f72dce4..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/copyright
+++ /dev/null
@@ -1,246 +0,0 @@
-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
deleted file mode 100644
index 17c5e62..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/fix.scanned.copyright
+++ /dev/null
@@ -1,3 +0,0 @@
-! 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
deleted file mode 100644
index 97cd209..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/gbp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100755
index d8309f6..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 51ee303..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 29a2042..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/control
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index a14fc80..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/generic
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
deleted file mode 100644
index 4316d28..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
----
-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
deleted file mode 100644
index 624190c..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/watch
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 67fd4b3..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 9ea17e5..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_commands.rb
+++ /dev/null
@@ -1,1188 +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'],
-      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
deleted file mode 100644
index 793c549..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_config_commands.c
+++ /dev/null
@@ -1,1046 +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_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
deleted file mode 100644
index 52b0456..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.c
+++ /dev/null
@@ -1,97 +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/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
deleted file mode 100644
index f0b8284..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.h
+++ /dev/null
@@ -1,150 +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 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
deleted file mode 100644
index da8de53..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.c
+++ /dev/null
@@ -1,1336 +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 <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
deleted file mode 100644
index 3b626cd..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.h
+++ /dev/null
@@ -1,73 +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 <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
deleted file mode 100644
index 8014cec..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_setup.c
+++ /dev/null
@@ -1,1747 +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_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
deleted file mode 100644
index 778e15a..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_types.h
+++ /dev/null
@@ -1,542 +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;
-  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
deleted file mode 100644
index 18d92e2..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.c
+++ /dev/null
@@ -1,319 +0,0 @@
-#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
deleted file mode 100644
index 726b99c..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index ad52a56..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_version.h
+++ /dev/null
@@ -1 +0,0 @@
-#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
deleted file mode 100644
index 321dadf..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#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
deleted file mode 100644
index b08e419..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index de86738..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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);
-}
-
-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
deleted file mode 100644
index 6fc80dd..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 654b449..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.c
+++ /dev/null
@@ -1,1213 +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>
-#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
deleted file mode 100644
index e22c4a0..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.h
+++ /dev/null
@@ -1,28 +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);
-
-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
deleted file mode 100755
index 0e87cb9..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.c
+++ /dev/null
@@ -1,558 +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;
-  }
-}
-
-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
deleted file mode 100755
index f0dae15..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.h
+++ /dev/null
@@ -1,66 +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);
-
-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
deleted file mode 100755
index 4243ad6..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/memstore.c
+++ /dev/null
@@ -1,3498 +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->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
deleted file mode 100644
index 755ee0b..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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) {
-  
-  
-}
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
deleted file mode 100644
index 611c305..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store-private.h
+++ /dev/null
@@ -1,180 +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;
-  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
deleted file mode 100644
index c1b9eef..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index a8359a3..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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
-}
-
-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
deleted file mode 100644
index be0f28b..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index a75bdb1..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index c78b37b..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 056959f..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index f9a9460..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 2a2bc31..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index a5fc973..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index c544d57..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 7fb6b35..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 34a05f4..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 439d9ee..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.c
+++ /dev/null
@@ -1,890 +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, *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
deleted file mode 100644
index b1d2cb2..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index b9d23ff..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 74a4633..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 95fcd28..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 3227faa..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index ab0e398..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 21593b6..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 604efe0..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 3737430..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 9f43283..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 0952469..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 2d74d77..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index feedfe3..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index eda8833..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 5538dd9..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index f99d14b..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 85810e8..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 7df58fb..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index c0eeca7..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 04289c6..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100755
index 13e9d8e..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/rdsstore.c
+++ /dev/null
@@ -1,2721 +0,0 @@
-#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
deleted file mode 100644
index b844b14..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b792720..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index bdb2a9d..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/add_fakesub.lua
+++ /dev/null
@@ -1,52 +0,0 @@
---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
deleted file mode 100644
index 7217d88..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/channel_keepalive.lua
+++ /dev/null
@@ -1,45 +0,0 @@
---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
deleted file mode 100644
index d52d747..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/delete.lua
+++ /dev/null
@@ -1,91 +0,0 @@
---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
deleted file mode 100644
index 2a39a10..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/find_channel.lua
+++ /dev/null
@@ -1,92 +0,0 @@
---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
deleted file mode 100644
index 986368f..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index ad0d742..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 54cac88..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 6a114ad..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/nostore_publish_multiexec_channel_info.lua
+++ /dev/null
@@ -1,56 +0,0 @@
---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
deleted file mode 100644
index 4fd58d6..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/publish.lua
+++ /dev/null
@@ -1,296 +0,0 @@
---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
deleted file mode 100644
index afe4090..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 9d351bc..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 5a24fa6..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_register.lua
+++ /dev/null
@@ -1,61 +0,0 @@
---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
deleted file mode 100644
index 2ca5c3e..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
+++ /dev/null
@@ -1,50 +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',
-  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
deleted file mode 100755
index 6cda77c..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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, '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
deleted file mode 100644
index 81ad514..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.c
+++ /dev/null
@@ -1,1185 +0,0 @@
-#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
deleted file mode 100644
index f67b9e6..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.h
+++ /dev/null
@@ -1,83 +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, 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
deleted file mode 100644
index 41b98b7..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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;
-  }
-}
-
-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
deleted file mode 100644
index a3a956b..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index cc551bb..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.c
+++ /dev/null
@@ -1,3824 +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)
-
-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
deleted file mode 100644
index 127b71d..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.h
+++ /dev/null
@@ -1,469 +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 <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
deleted file mode 100644
index e3052dc..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.c
+++ /dev/null
@@ -1,248 +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->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
deleted file mode 100644
index a14ae14..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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       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
deleted file mode 100644
index d599ca7..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_stats.c
+++ /dev/null
@@ -1,578 +0,0 @@
-#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
deleted file mode 100644
index 6c830c0..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store-private.h
+++ /dev/null
@@ -1,114 +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
-
-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
deleted file mode 100755
index 23d05f2..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store.h
+++ /dev/null
@@ -1,26 +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_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
deleted file mode 100755
index 5dcd466..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.c
+++ /dev/null
@@ -1,1293 +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 //////////
-
-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
deleted file mode 100644
index 88e8d1a..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 849426e..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#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
deleted file mode 100644
index c5335de..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index ab439f5..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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_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
deleted file mode 100644
index dcb52c9..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index c165334..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 03edec4..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index a598101..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.c
+++ /dev/null
@@ -1,414 +0,0 @@
-#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
deleted file mode 100644
index 424a7c7..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index fb77b55..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 48a9834..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index e652841..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.c
+++ /dev/null
@@ -1,259 +0,0 @@
-#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
deleted file mode 100644
index efb5197..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index fc0955d..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.c
+++ /dev/null
@@ -1,291 +0,0 @@
-#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
deleted file mode 100644
index 6a0e097..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 1babf20..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.c
+++ /dev/null
@@ -1,157 +0,0 @@
-#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
deleted file mode 100644
index b85530b..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index aba5bbc..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 0c9e609..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index c77c628..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#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
deleted file mode 100644
index c493730..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index cd9d85c..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 71400c6..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.c
+++ /dev/null
@@ -1,551 +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.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
deleted file mode 100644
index 65509ed..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index a0a2579..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 15d58e8..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 056197f..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.c
+++ /dev/null
@@ -1,174 +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->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
deleted file mode 100644
index d735598..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index f0b4b1d..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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, 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
deleted file mode 100644
index 5c8d0e4..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index f8e8e0e..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.c
+++ /dev/null
@@ -1,2065 +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>
-#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
deleted file mode 100644
index 034b0b5..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 91db592..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index e113470..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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 <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
deleted file mode 100644
index 010a4b8..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index c01bbec..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.c
+++ /dev/null
@@ -1,212 +0,0 @@
-#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
deleted file mode 100644
index 1469fe8..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#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
deleted file mode 100644
index c2ab34d..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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);
-  }
-}
-
-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
deleted file mode 100644
index c9bab81..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 2148c11..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index fa12299..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 1c761e1..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 0276227..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 0092c51..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 640870a..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 7019416..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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;
-}
-*/
-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
deleted file mode 100644
index eab1de9..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 45fd4f2..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.c
+++ /dev/null
@@ -1,175 +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;
-}
-
-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
deleted file mode 100644
index 6c3e7d9..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.h
+++ /dev/null
@@ -1,54 +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);
-
-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
deleted file mode 100644
index c1fe850..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 99d35d8..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 1f62028..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index d465de8..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index c58bfc7..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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;
-
-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
deleted file mode 100644
index 36c5152..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 5614979..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index f67ad3b..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 25604ab..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index f737874..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index c79ceb0..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 660f8e0..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 8d67318..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index df8dcb9..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 1d5b857..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#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
deleted file mode 100644
index 986530d..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#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
deleted file mode 100644
index 8042f04..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.c
+++ /dev/null
@@ -1,325 +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>
-#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
deleted file mode 100644
index b96b78d..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 8c14008..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.c
+++ /dev/null
@@ -1,209 +0,0 @@
-#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
deleted file mode 100644
index 2b0b8bd..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 0b44060..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.c
+++ /dev/null
@@ -1,137 +0,0 @@
-#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
deleted file mode 100644
index ce3cca1..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#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
deleted file mode 100644
index 963d085..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.c
+++ /dev/null
@@ -1,1334 +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(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
deleted file mode 100644
index 54311ef..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.h
+++ /dev/null
@@ -1,86 +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(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
deleted file mode 100644
index 5670b73..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 87b8f05..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 817579d..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/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
deleted file mode 100644
index 52417dc..0000000
--- a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/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/src/core/nginx.c b/src/core/nginx.c
index 23edb59..0deb27b 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -340,21 +340,14 @@ 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) {
-        child_pid = ngx_daemon(cycle->log);
-        if (child_pid == NGX_ERROR) {
+        if (ngx_daemon(cycle->log) != NGX_OK) {
             return 1;
         }
 
@@ -367,19 +360,8 @@ main(int argc, char *const *argv)
 
 #endif
 
-    /* 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_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
+        return 1;
     }
 
     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 04485cc..89f277f 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1712,7 +1712,6 @@ 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;
 
@@ -1915,23 +1914,6 @@ 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;
@@ -2079,21 +2061,6 @@ 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;
@@ -2716,41 +2683,6 @@ 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;
@@ -2890,9 +2822,6 @@ 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 97fde1d..ebb2c35 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -86,19 +86,10 @@
 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;
 };
 
 
@@ -137,10 +128,6 @@ 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;
 };
 
 
@@ -150,7 +137,7 @@ struct ngx_ssl_connection_s {
 #define NGX_SSL_DFLT_BUILTIN_SCACHE  -5
 
 
-#define NGX_SSL_MAX_SESSION_SIZE  16384
+#define NGX_SSL_MAX_SESSION_SIZE  4096
 
 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 f32ae33..1c92d9f 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -290,41 +290,6 @@ 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
 };
 
@@ -664,11 +629,6 @@ 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;
 }
@@ -734,20 +694,6 @@ 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) {
@@ -944,28 +890,6 @@ 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 1d7e63e..c69c8ff 100644
--- a/src/http/modules/ngx_http_ssl_module.h
+++ b/src/http/modules/ngx_http_ssl_module.h
@@ -62,12 +62,6 @@ 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;
 
 
diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
index 3719854..385c49b 100644
--- a/src/os/unix/ngx_daemon.c
+++ b/src/os/unix/ngx_daemon.c
@@ -7,17 +7,14 @@
 
 #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 (pid_child) {
+    switch (fork()) {
     case -1:
         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed");
         return NGX_ERROR;
@@ -26,8 +23,7 @@ ngx_daemon(ngx_log_t *log)
         break;
 
     default:
-        /* let caller do the exit() */
-        return pid_child;
+        exit(0);
     }
 
     ngx_parent = ngx_pid;
diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h
index 3a5c765..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(NGX_GNU_HURD) || 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