Merge branch 'upstream'

echo-nginx-module/.gitattributes

@@ -0,0 +1 @@
+*.t linguist-language=Text

echo-nginx-module/.gitignore

@@ -0,0 +1,65 @@
+.libs
+*.swp
+*.slo
+*.la
+*.swo
+*.lo
+*.mobi
+genmobi.sh
+*~
+*.o
+print.txt
+.rsync
+*.tar.gz
+dist
+build[789]
+build
+tags
+update-readme
+*.tmp
+test/Makefile
+test/blib
+test.sh
+t.sh
+t/t.sh
+test/t/servroot/
+releng
+reset
+*.t_
+reindex
+src/location.h
+src/filter.c
+src/subrequest.h
+src/sleep.h
+src/util.c
+src/echo.c
+src/info.c
+src/util.h
+src/var.h
+src/filter.h
+src/sleep.c
+src/var.c
+src/timer.c
+src/module.h
+src/echo.h
+src/info.h
+src/foreach.c
+src/location.c
+src/timer.h
+src/module.c
+src/subrequest.c
+src/handler.h
+src/foreach.h
+src/handler.c
+nginx
+*.html
+ctags
+t/servroot
+all
+buildroot/
+go
+Changes
+build1[0-9]
+analyze
+Makefile
+*.plist

echo-nginx-module/.travis.yml

@@ -0,0 +1,40 @@
+sudo: required
+dist: trusty
+
+os: linux
+
+language: c
+
+compiler:
+  - gcc
+  - clang
+
+env:
+  global:
+    - LUAJIT_LIB=/usr/lib64/libluajit-5.1.so
+    - LUAJIT_INC=/usr/include/luajit-2.0
+  matrix:
+    - NGINX_VERSION=1.9.15
+    - NGINX_VERSION=1.10.0
+
+before_install:
+  - sudo apt-get install -qq -y cpanminus libluajit-5.1-dev libgd-dev
+  - 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/nginx-eval-module.git
+
+script:
+  - 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 -r t

echo-nginx-module/LICENSE

@@ -0,0 +1,25 @@
+Copyright (C) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.