mirror of
https://github.com/bunkerity/bunkerized-nginx
synced 2023-12-13 21:30:18 +01:00
Merge commit '2678b91586e9183b47327fbb0f11ad23020f195f' as 'src/deps/src/lua-resty-upload'
This commit is contained in:
commit
f81788c00c
11 changed files with 1925 additions and 0 deletions
1
src/deps/src/lua-resty-upload/.gitattributes
vendored
Normal file
1
src/deps/src/lua-resty-upload/.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
*.t linguist-language=Text
|
7
src/deps/src/lua-resty-upload/.gitignore
vendored
Normal file
7
src/deps/src/lua-resty-upload/.gitignore
vendored
Normal file
|
@ -0,0 +1,7 @@
|
|||
*.swp
|
||||
*.swo
|
||||
*~
|
||||
go
|
||||
t/servroot/
|
||||
reindex
|
||||
test.html
|
68
src/deps/src/lua-resty-upload/.travis.yml
Normal file
68
src/deps/src/lua-resty-upload/.travis.yml
Normal file
|
@ -0,0 +1,68 @@
|
|||
sudo: required
|
||||
dist: bionic
|
||||
|
||||
os: linux
|
||||
|
||||
language: c
|
||||
|
||||
compiler:
|
||||
- gcc
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- download-cache
|
||||
|
||||
env:
|
||||
global:
|
||||
- JOBS=3
|
||||
- NGX_BUILD_JOBS=$JOBS
|
||||
- LUAJIT_PREFIX=/opt/luajit21
|
||||
- LUAJIT_LIB=$LUAJIT_PREFIX/lib
|
||||
- LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
|
||||
- LUA_INCLUDE_DIR=$LUAJIT_INC
|
||||
- LUA_CMODULE_DIR=/lib
|
||||
- OPENSSL_PREFIX=/opt/ssl
|
||||
- OPENSSL_LIB=$OPENSSL_PREFIX/lib
|
||||
- OPENSSL_INC=$OPENSSL_PREFIX/include
|
||||
- LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
|
||||
- TEST_NGINX_SLEEP=0.006
|
||||
matrix:
|
||||
- NGINX_VERSION=1.17.8 OPENSSL_VER=1.1.0l
|
||||
- NGINX_VERSION=1.19.9 OPENSSL_VER=1.1.1k
|
||||
|
||||
install:
|
||||
- if [ ! -d download-cache ]; then mkdir download-cache; fi
|
||||
- if [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -O download-cache/openssl-$OPENSSL_VER.tar.gz https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz; fi
|
||||
- sudo apt-get install -qq -y cpanminus axel
|
||||
- sudo cpanm --notest Test::Nginx > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- wget http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
|
||||
- git clone https://github.com/openresty/openresty.git ../openresty
|
||||
- git clone https://github.com/openresty/nginx-devel-utils.git
|
||||
- git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-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/no-pool-nginx.git ../no-pool-nginx
|
||||
- git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git
|
||||
- git clone https://github.com/openresty/mockeagain.git
|
||||
|
||||
script:
|
||||
- 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 ..
|
||||
- tar zxf download-cache/openssl-$OPENSSL_VER.tar.gz
|
||||
- cd openssl-$OPENSSL_VER/
|
||||
- ./config shared --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- sudo make PATH=$PATH install_sw > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- cd ../mockeagain/ && make CC=$CC -j$JOBS && cd ..
|
||||
- export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH
|
||||
- export LD_PRELOAD=$PWD/mockeagain/mockeagain.so
|
||||
- export LD_LIBRARY_PATH=$PWD/mockeagain:$LD_LIBRARY_PATH
|
||||
- export TEST_NGINX_RESOLVER=8.8.4.4
|
||||
- export NGX_BUILD_CC=$CC
|
||||
- ngx-build $NGINX_VERSION --with-ipv6 --with-http_realip_module --with-http_ssl_module --with-cc-opt="-I$OPENSSL_INC" --with-ld-opt="-L$OPENSSL_LIB -Wl,-rpath,$OPENSSL_LIB" --add-module=../ndk-nginx-module --add-module=../lua-nginx-module --with-debug > build.log 2>&1 || (cat build.log && exit 1)
|
||||
- nginx -V
|
||||
- ldd `which nginx`|grep -E 'luajit|ssl|pcre'
|
||||
- prove -I. -r t
|
18
src/deps/src/lua-resty-upload/Makefile
Normal file
18
src/deps/src/lua-resty-upload/Makefile
Normal file
|
@ -0,0 +1,18 @@
|
|||
OPENRESTY_PREFIX=/usr/local/openresty-debug
|
||||
|
||||
PREFIX ?= /usr/local
|
||||
LUA_INCLUDE_DIR ?= $(PREFIX)/include
|
||||
LUA_LIB_DIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION)
|
||||
INSTALL ?= install
|
||||
|
||||
.PHONY: all test install
|
||||
|
||||
all: ;
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d $(DESTDIR)/$(LUA_LIB_DIR)/resty
|
||||
$(INSTALL) lib/resty/*.lua $(DESTDIR)/$(LUA_LIB_DIR)/resty
|
||||
|
||||
test: all
|
||||
PATH=$(OPENRESTY_PREFIX)/nginx/sbin:$$PATH prove -I../test-nginx/lib -r t
|
||||
|
212
src/deps/src/lua-resty-upload/README.markdown
Normal file
212
src/deps/src/lua-resty-upload/README.markdown
Normal file
|
@ -0,0 +1,212 @@
|
|||
Name
|
||||
====
|
||||
|
||||
lua-resty-upload - Streaming reader and parser for HTTP file uploading based on ngx_lua cosocket
|
||||
|
||||
Table of Contents
|
||||
=================
|
||||
|
||||
* [Name](#name)
|
||||
* [Status](#status)
|
||||
* [Description](#description)
|
||||
* [Synopsis](#synopsis)
|
||||
* [Author](#author)
|
||||
* [Copyright and License](#copyright-and-license)
|
||||
* [See Also](#see-also)
|
||||
|
||||
Status
|
||||
======
|
||||
|
||||
This library is considered production ready.
|
||||
|
||||
Description
|
||||
===========
|
||||
|
||||
This Lua library is a streaming file uploading API for the ngx_lua nginx module:
|
||||
|
||||
http://wiki.nginx.org/HttpLuaModule
|
||||
|
||||
The multipart/form-data MIME type is supported.
|
||||
|
||||
The API of this library just returns tokens one by one. The user just needs to call the `read` method repeatedly until a nil token type is returned. For each token returned from the `read` method, just check the first return value for the current token type. The token type can be `header`, `body`, and `part end`. Each `multipart/form-data` form field parsed consists of several `header` tokens holding each field header, several `body` tokens holding each body data chunk, and a `part end` flag indicating the field end.
|
||||
|
||||
This is how streaming reading works. Even for giga bytes of file data input, the memory used in the lua land can be small and constant, as long as the user does not accumulate the input data chunks herself.
|
||||
|
||||
This Lua library takes advantage of ngx_lua's cosocket API, which ensures
|
||||
100% nonblocking behavior.
|
||||
|
||||
Note that at least [ngx_lua 0.7.9](https://github.com/chaoslawful/lua-nginx-module/tags) or [OpenResty 1.2.4.14](http://openresty.org/#Download) is required.
|
||||
|
||||
Synopsis
|
||||
========
|
||||
|
||||
```lua
|
||||
lua_package_path "/path/to/lua-resty-upload/lib/?.lua;;";
|
||||
|
||||
server {
|
||||
location /test {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local cjson = require "cjson"
|
||||
|
||||
local chunk_size = 5 -- should be set to 4096 or 8192
|
||||
-- for real-world settings
|
||||
|
||||
local form, err = upload:new(chunk_size)
|
||||
if not form then
|
||||
ngx.log(ngx.ERR, "failed to new upload: ", err)
|
||||
ngx.exit(500)
|
||||
end
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", cjson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", cjson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
A typical output of the /test location defined above is:
|
||||
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text\/plain","Content-Type: text\/plain"]]
|
||||
read: ["body","Hello"]
|
||||
read: ["body",", wor"]
|
||||
read: ["body","ld"]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
|
||||
read: ["body","value"]
|
||||
read: ["body","\r\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
|
||||
You can use the [lua-resty-string](https://github.com/agentzh/lua-resty-string) library to compute SHA-1 and MD5 digest of the file data incrementally. Here is such an example:
|
||||
|
||||
```lua
|
||||
local resty_sha1 = require "resty.sha1"
|
||||
local upload = require "resty.upload"
|
||||
|
||||
local chunk_size = 4096
|
||||
local form = upload:new(chunk_size)
|
||||
local sha1 = resty_sha1:new()
|
||||
local file
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
if typ == "header" then
|
||||
local file_name = my_get_file_name(res)
|
||||
if file_name then
|
||||
file = io.open(file_name, "w+")
|
||||
if not file then
|
||||
ngx.say("failed to open file ", file_name)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
elseif typ == "body" then
|
||||
if file then
|
||||
file:write(res)
|
||||
sha1:update(res)
|
||||
end
|
||||
|
||||
elseif typ == "part_end" then
|
||||
file:close()
|
||||
file = nil
|
||||
local sha1_sum = sha1:final()
|
||||
sha1:reset()
|
||||
my_save_sha1_sum(sha1_sum)
|
||||
|
||||
elseif typ == "eof" then
|
||||
break
|
||||
|
||||
else
|
||||
-- do nothing
|
||||
end
|
||||
end
|
||||
```
|
||||
|
||||
If you want to compute MD5 sums for the uploaded files, just use the
|
||||
resty.md5 module shipped by the [lua-resty-string](https://github.com/agentzh/lua-resty-string) library. It has
|
||||
a similar API as resty.sha1.
|
||||
|
||||
For big file uploading, it is important not to buffer all the data in memory.
|
||||
That is, you should never accumulate data chunks either in a huge Lua string or
|
||||
in a huge Lua table. You must write the data chunk into files as soon as possible and
|
||||
throw away the data chunk immediately (to let the Lua GC free it up).
|
||||
|
||||
Instead of writing the data chunk into files (as shown in the example above),
|
||||
you can also write the data chunks to upstream cosocket connections if you do
|
||||
not want to save the data on local file systems.
|
||||
|
||||
[Back to TOC](#table-of-contents)
|
||||
|
||||
Usage
|
||||
=====
|
||||
|
||||
```lua
|
||||
local upload = require "resty.upload"
|
||||
local form, err = upload:new(self, chunk_size, max_line_size, preserve_body)
|
||||
```
|
||||
`chunk_size` defaults to 4096. It is the size used to read data from the socket.
|
||||
|
||||
`max_line_size` defaults to 512. It is the size limit to read the chunked body header.
|
||||
|
||||
By Default, `lua-resty-upload` will consume the request body. For proxy mode this means upstream will not see the body. When `preserve_body` is set to true, the request body will be preserved. Note that this option is not free. When enabled, it will double the memory usage of `resty.upload`.
|
||||
|
||||
Author
|
||||
======
|
||||
|
||||
Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
|
||||
|
||||
[Back to TOC](#table-of-contents)
|
||||
|
||||
Copyright and License
|
||||
=====================
|
||||
|
||||
This module is licensed under the BSD license.
|
||||
|
||||
Copyright (C) 2012-2017, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
|
||||
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
[Back to TOC](#table-of-contents)
|
||||
|
||||
See Also
|
||||
========
|
||||
* the [ngx_lua module](http://wiki.nginx.org/HttpLuaModule)
|
||||
* the [lua-resty-string](https://github.com/agentzh/lua-resty-string) library
|
||||
* the [lua-resty-memcached](https://github.com/agentzh/lua-resty-memcached) library
|
||||
* the [lua-resty-redis](https://github.com/agentzh/lua-resty-redis) library
|
||||
* the [lua-resty-mysql](https://github.com/agentzh/lua-resty-mysql) library
|
||||
|
||||
[Back to TOC](#table-of-contents)
|
||||
|
9
src/deps/src/lua-resty-upload/dist.ini
Normal file
9
src/deps/src/lua-resty-upload/dist.ini
Normal file
|
@ -0,0 +1,9 @@
|
|||
name=lua-resty-upload
|
||||
abstract=Streaming reader and parser for HTTP file uploading based on ngx_lua cosocket
|
||||
author=Yichun "agentzh" Zhang (agentzh)
|
||||
is_original=yes
|
||||
license=2bsd
|
||||
lib_dir=lib
|
||||
doc_dir=lib
|
||||
repo_link=https://github.com/openresty/lua-resty-upload
|
||||
main_module=lib/resty/upload.lua
|
330
src/deps/src/lua-resty-upload/lib/resty/upload.lua
Normal file
330
src/deps/src/lua-resty-upload/lib/resty/upload.lua
Normal file
|
@ -0,0 +1,330 @@
|
|||
-- Copyright (C) Yichun Zhang (agentzh)
|
||||
|
||||
|
||||
-- local sub = string.sub
|
||||
local req_socket = ngx.req.socket
|
||||
local match = string.match
|
||||
local setmetatable = setmetatable
|
||||
local type = type
|
||||
local ngx_var = ngx.var
|
||||
local ngx_init_body = ngx.req.init_body
|
||||
local ngx_finish_body = ngx.req.finish_body
|
||||
local ngx_append_body = ngx.req.append_body
|
||||
-- local print = print
|
||||
|
||||
|
||||
local _M = { _VERSION = '0.11' }
|
||||
|
||||
|
||||
local CHUNK_SIZE = 4096
|
||||
local MAX_LINE_SIZE = 512
|
||||
|
||||
local STATE_BEGIN = 1
|
||||
local STATE_READING_HEADER = 2
|
||||
local STATE_READING_BODY = 3
|
||||
local STATE_EOF = 4
|
||||
|
||||
local mt = { __index = _M }
|
||||
|
||||
local state_handlers
|
||||
|
||||
local function wrapped_receiveuntil(self, until_str)
|
||||
local iter, err_outer = self:old_receiveuntil(until_str)
|
||||
if iter == nil then
|
||||
ngx_finish_body()
|
||||
end
|
||||
|
||||
local function wrapped(size)
|
||||
local ret, err = iter(size)
|
||||
if ret then
|
||||
ngx_append_body(ret)
|
||||
end
|
||||
|
||||
-- non-nil ret for call with no size or successful size call and nil ret
|
||||
if (not size and ret) or (size and not ret and not err) then
|
||||
ngx_append_body(until_str)
|
||||
end
|
||||
return ret, err
|
||||
end
|
||||
|
||||
return wrapped, err_outer
|
||||
end
|
||||
|
||||
|
||||
local function wrapped_receive(self, arg)
|
||||
local ret, err, partial = self:old_receive(arg)
|
||||
if ret then
|
||||
ngx_append_body(ret)
|
||||
|
||||
elseif partial then
|
||||
ngx_append_body(partial)
|
||||
end
|
||||
|
||||
if ret == nil then
|
||||
ngx_finish_body()
|
||||
end
|
||||
|
||||
return ret, err
|
||||
end
|
||||
|
||||
|
||||
local function req_socket_body_collector(sock)
|
||||
sock.old_receiveuntil = sock.receiveuntil
|
||||
sock.old_receive = sock.receive
|
||||
sock.receiveuntil = wrapped_receiveuntil
|
||||
sock.receive = wrapped_receive
|
||||
end
|
||||
|
||||
|
||||
local function get_boundary()
|
||||
local header = ngx_var.content_type
|
||||
if not header then
|
||||
return nil
|
||||
end
|
||||
|
||||
if type(header) == "table" then
|
||||
header = header[1]
|
||||
end
|
||||
|
||||
local m = match(header, ";%s*boundary=\"([^\"]+)\"")
|
||||
if m then
|
||||
return m
|
||||
end
|
||||
|
||||
return match(header, ";%s*boundary=([^\",;]+)")
|
||||
end
|
||||
|
||||
|
||||
function _M.new(self, chunk_size, max_line_size, preserve_body)
|
||||
local boundary = get_boundary()
|
||||
|
||||
-- print("boundary: ", boundary)
|
||||
|
||||
if not boundary then
|
||||
return nil, "no boundary defined in Content-Type"
|
||||
end
|
||||
|
||||
-- print('boundary: "', boundary, '"')
|
||||
|
||||
local sock, err = req_socket()
|
||||
if not sock then
|
||||
return nil, err
|
||||
end
|
||||
|
||||
if preserve_body then
|
||||
ngx_init_body(chunk_size)
|
||||
req_socket_body_collector(sock)
|
||||
end
|
||||
|
||||
local read2boundary, err = sock:receiveuntil("--" .. boundary)
|
||||
if not read2boundary then
|
||||
return nil, err
|
||||
end
|
||||
|
||||
local read_line, err = sock:receiveuntil("\r\n")
|
||||
if not read_line then
|
||||
return nil, err
|
||||
end
|
||||
|
||||
return setmetatable({
|
||||
sock = sock,
|
||||
size = chunk_size or CHUNK_SIZE,
|
||||
line_size = max_line_size or MAX_LINE_SIZE,
|
||||
read2boundary = read2boundary,
|
||||
read_line = read_line,
|
||||
boundary = boundary,
|
||||
state = STATE_BEGIN,
|
||||
preserve_body = preserve_body
|
||||
}, mt)
|
||||
end
|
||||
|
||||
|
||||
function _M.set_timeout(self, timeout)
|
||||
local sock = self.sock
|
||||
if not sock then
|
||||
return nil, "not initialized"
|
||||
end
|
||||
|
||||
return sock:settimeout(timeout)
|
||||
end
|
||||
|
||||
|
||||
local function discard_line(self)
|
||||
local read_line = self.read_line
|
||||
|
||||
local line, err = read_line(self.line_size)
|
||||
if not line then
|
||||
return nil, err
|
||||
end
|
||||
|
||||
local dummy, err = read_line(1)
|
||||
if dummy then
|
||||
if self.preserve_body then
|
||||
ngx_finish_body()
|
||||
end
|
||||
|
||||
return nil, "line too long: " .. line .. dummy .. "..."
|
||||
end
|
||||
|
||||
if err then
|
||||
return nil, err
|
||||
end
|
||||
|
||||
return 1
|
||||
end
|
||||
|
||||
|
||||
local function discard_rest(self)
|
||||
local sock = self.sock
|
||||
local size = self.size
|
||||
|
||||
while true do
|
||||
local dummy, err = sock:receive(size)
|
||||
if err and err ~= 'closed' then
|
||||
return nil, err
|
||||
end
|
||||
|
||||
if not dummy then
|
||||
return 1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local function read_body_part(self)
|
||||
local read2boundary = self.read2boundary
|
||||
|
||||
local chunk, err = read2boundary(self.size)
|
||||
if err then
|
||||
return nil, nil, err
|
||||
end
|
||||
|
||||
if not chunk then
|
||||
local sock = self.sock
|
||||
|
||||
local data = sock:receive(2)
|
||||
if data == "--" then
|
||||
local ok, err = discard_rest(self)
|
||||
if not ok then
|
||||
return nil, nil, err
|
||||
end
|
||||
|
||||
self.state = STATE_EOF
|
||||
return "part_end"
|
||||
end
|
||||
|
||||
if data ~= "\r\n" then
|
||||
local ok, err = discard_line(self)
|
||||
if not ok then
|
||||
return nil, nil, err
|
||||
end
|
||||
end
|
||||
|
||||
self.state = STATE_READING_HEADER
|
||||
return "part_end"
|
||||
end
|
||||
|
||||
return "body", chunk
|
||||
end
|
||||
|
||||
|
||||
local function read_header(self)
|
||||
local read_line = self.read_line
|
||||
|
||||
local line, err = read_line(self.line_size)
|
||||
if err then
|
||||
return nil, nil, err
|
||||
end
|
||||
|
||||
local dummy, err = read_line(1)
|
||||
if dummy then
|
||||
if self.preserve_body then
|
||||
ngx_finish_body()
|
||||
end
|
||||
|
||||
return nil, nil, "line too long: " .. line .. dummy .. "..."
|
||||
end
|
||||
|
||||
if err then
|
||||
return nil, nil, err
|
||||
end
|
||||
|
||||
-- print("read line: ", line)
|
||||
|
||||
if line == "" then
|
||||
-- after the last header
|
||||
self.state = STATE_READING_BODY
|
||||
return read_body_part(self)
|
||||
end
|
||||
|
||||
local key, value = match(line, "([^: \t]+)%s*:%s*(.+)")
|
||||
if not key then
|
||||
return 'header', line
|
||||
end
|
||||
|
||||
return 'header', {key, value, line}
|
||||
end
|
||||
|
||||
|
||||
local function eof()
|
||||
return "eof", nil
|
||||
end
|
||||
|
||||
|
||||
function _M.read(self)
|
||||
-- local size = self.size
|
||||
|
||||
local handler = state_handlers[self.state]
|
||||
if handler then
|
||||
return handler(self)
|
||||
end
|
||||
|
||||
return nil, nil, "bad state: " .. self.state
|
||||
end
|
||||
|
||||
|
||||
local function read_preamble(self)
|
||||
local sock = self.sock
|
||||
if not sock then
|
||||
return nil, nil, "not initialized"
|
||||
end
|
||||
|
||||
local size = self.size
|
||||
local read2boundary = self.read2boundary
|
||||
|
||||
while true do
|
||||
local preamble = read2boundary(size)
|
||||
if not preamble then
|
||||
break
|
||||
end
|
||||
|
||||
-- discard the preamble data chunk
|
||||
-- print("read preamble: ", preamble)
|
||||
end
|
||||
|
||||
local ok, err = discard_line(self)
|
||||
if not ok then
|
||||
return nil, nil, err
|
||||
end
|
||||
|
||||
local read2boundary, err = sock:receiveuntil("\r\n--" .. self.boundary)
|
||||
if not read2boundary then
|
||||
return nil, nil, err
|
||||
end
|
||||
|
||||
self.read2boundary = read2boundary
|
||||
|
||||
self.state = STATE_READING_HEADER
|
||||
return read_header(self)
|
||||
end
|
||||
|
||||
|
||||
state_handlers = {
|
||||
read_preamble,
|
||||
read_header,
|
||||
read_body_part,
|
||||
eof
|
||||
}
|
||||
|
||||
|
||||
return _M
|
89
src/deps/src/lua-resty-upload/t/lib/ljson.lua
Normal file
89
src/deps/src/lua-resty-upload/t/lib/ljson.lua
Normal file
|
@ -0,0 +1,89 @@
|
|||
local ngx_null = ngx.null
|
||||
local tostring = tostring
|
||||
local byte = string.byte
|
||||
local gsub = string.gsub
|
||||
local sort = table.sort
|
||||
local pairs = pairs
|
||||
local ipairs = ipairs
|
||||
local concat = table.concat
|
||||
|
||||
local ok, new_tab = pcall(require, "table.new")
|
||||
if not ok then
|
||||
new_tab = function (narr, nrec) return {} end
|
||||
end
|
||||
|
||||
local _M = {}
|
||||
|
||||
local metachars = {
|
||||
['\t'] = '\\t',
|
||||
["\\"] = "\\\\",
|
||||
['"'] = '\\"',
|
||||
['\r'] = '\\r',
|
||||
['\n'] = '\\n',
|
||||
}
|
||||
|
||||
local function encode_str(s)
|
||||
-- XXX we will rewrite this when string.buffer is implemented
|
||||
-- in LuaJIT 2.1 because string.gsub cannot be JIT compiled.
|
||||
return gsub(s, '["\\\r\n\t]', metachars)
|
||||
end
|
||||
|
||||
local function is_arr(t)
|
||||
local exp = 1
|
||||
for k, _ in pairs(t) do
|
||||
if k ~= exp then
|
||||
return nil
|
||||
end
|
||||
exp = exp + 1
|
||||
end
|
||||
return exp - 1
|
||||
end
|
||||
|
||||
local encode
|
||||
|
||||
encode = function (v)
|
||||
if v == nil or v == ngx_null then
|
||||
return "null"
|
||||
end
|
||||
|
||||
local typ = type(v)
|
||||
if typ == 'string' then
|
||||
return '"' .. encode_str(v) .. '"'
|
||||
end
|
||||
|
||||
if typ == 'number' or typ == 'boolean' then
|
||||
return tostring(v)
|
||||
end
|
||||
|
||||
if typ == 'table' then
|
||||
local n = is_arr(v)
|
||||
if n then
|
||||
local bits = new_tab(n, 0)
|
||||
for i, elem in ipairs(v) do
|
||||
bits[i] = encode(elem)
|
||||
end
|
||||
return "[" .. concat(bits, ",") .. "]"
|
||||
end
|
||||
|
||||
local keys = {}
|
||||
local i = 0
|
||||
for key, _ in pairs(v) do
|
||||
i = i + 1
|
||||
keys[i] = key
|
||||
end
|
||||
sort(keys)
|
||||
|
||||
local bits = new_tab(0, i)
|
||||
i = 0
|
||||
for _, key in ipairs(keys) do
|
||||
i = i + 1
|
||||
bits[i] = encode(key) .. ":" .. encode(v[key])
|
||||
end
|
||||
return "{" .. concat(bits, ",") .. "}"
|
||||
end
|
||||
|
||||
return '"<' .. typ .. '>"'
|
||||
end
|
||||
_M.encode = encode
|
||||
|
||||
return _M
|
772
src/deps/src/lua-resty-upload/t/sanity.t
Normal file
772
src/deps/src/lua-resty-upload/t/sanity.t
Normal file
|
@ -0,0 +1,772 @@
|
|||
# vim:set ft= ts=4 sw=4 et:
|
||||
|
||||
use Test::Nginx::Socket::Lua;
|
||||
use Cwd qw(cwd);
|
||||
|
||||
repeat_each(2);
|
||||
|
||||
plan tests => repeat_each() * (3 * blocks());
|
||||
|
||||
my $pwd = cwd();
|
||||
|
||||
our $HttpConfig = qq{
|
||||
lua_package_path "$pwd/lib/?.lua;$pwd/t/lib/?.lua;;";
|
||||
lua_package_cpath "/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;";
|
||||
};
|
||||
|
||||
$ENV{TEST_NGINX_RESOLVER} = '8.8.8.8';
|
||||
|
||||
no_long_string();
|
||||
#no_diff();
|
||||
|
||||
run_tests();
|
||||
|
||||
__DATA__
|
||||
|
||||
=== TEST 1: basic
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new(5)
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=---------------------------820127721219505131303151179
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
\r
|
||||
Hello, world\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179--\r
|
||||
}
|
||||
--- response_body
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text/plain","Content-Type: text/plain"]]
|
||||
read: ["body","Hello"]
|
||||
read: ["body",", wor"]
|
||||
read: ["body","ld"]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
|
||||
read: ["body","value"]
|
||||
read: ["body","\r\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 2: in-part header line too long
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new(5)
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=---------------------------820127721219505131303151179
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
} . ("Hello, world" x 64) . qq{\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179--\r
|
||||
}
|
||||
--- response_body
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text/plain","Content-Type: text/plain"]]
|
||||
failed to read: line too long: Hello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, wo...
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 3: terminate line too long
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new(5)
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=---------------------------820127721219505131303151179
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
\r
|
||||
Hello, world\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179} . ("a" x 1024) . qq{--\r
|
||||
}
|
||||
--- response_body
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text/plain","Content-Type: text/plain"]]
|
||||
read: ["body","Hello"]
|
||||
read: ["body",", wor"]
|
||||
read: ["body","ld"]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
|
||||
read: ["body","value"]
|
||||
read: ["body","\r\n"]
|
||||
failed to read: line too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 4: example from RFC 1521
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new(20)
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
content-TYPE: multipart/form-data; boundary="simple boundary"
|
||||
--- request eval
|
||||
qq{POST /t
|
||||
This is the preamble. It is to be ignored, though it
|
||||
is a handy place for mail composers to include an
|
||||
explanatory note to non-MIME conformant readers.
|
||||
--simple boundary\r
|
||||
\r
|
||||
This is implicitly typed plain ASCII text.
|
||||
It does NOT end with a linebreak.\r
|
||||
--simple boundary\r
|
||||
Content-type: text/plain; charset=us-ascii\r
|
||||
\r
|
||||
This is explicitly typed plain ASCII text.
|
||||
It DOES end with a linebreak.
|
||||
\r
|
||||
--simple boundary--\r
|
||||
This is the epilogue. It is also to be ignored.
|
||||
|
||||
}
|
||||
--- response_body
|
||||
read: ["body","This is implicitly t"]
|
||||
read: ["body","yped plain ASCII tex"]
|
||||
read: ["body","t.\nIt does NOT end w"]
|
||||
read: ["body","ith a linebreak."]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-type","text/plain; charset=us-ascii","Content-type: text/plain; charset=us-ascii"]]
|
||||
read: ["body","This is explicitly t"]
|
||||
read: ["body","yped plain ASCII tex"]
|
||||
read: ["body","t.\nIt DOES end with "]
|
||||
read: ["body","a linebreak.\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 5: example from RFC 1521, no double quotes for the boundary value in the Content-Type response header
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new(20)
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=simple boundary
|
||||
--- request eval
|
||||
qq{POST /t
|
||||
This is the preamble. It is to be ignored, though it
|
||||
is a handy place for mail composers to include an
|
||||
explanatory note to non-MIME conformant readers.
|
||||
--simple boundary\r
|
||||
\r
|
||||
This is implicitly typed plain ASCII text.
|
||||
It does NOT end with a linebreak.\r
|
||||
--simple boundary\r
|
||||
Content-type: text/plain; charset=us-ascii\r
|
||||
\r
|
||||
This is explicitly typed plain ASCII text.
|
||||
It DOES end with a linebreak.
|
||||
\r
|
||||
--simple boundary--\r
|
||||
This is the epilogue. It is also to be ignored.
|
||||
|
||||
}
|
||||
--- response_body
|
||||
read: ["body","This is implicitly t"]
|
||||
read: ["body","yped plain ASCII tex"]
|
||||
read: ["body","t.\nIt does NOT end w"]
|
||||
read: ["body","ith a linebreak."]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-type","text/plain; charset=us-ascii","Content-type: text/plain; charset=us-ascii"]]
|
||||
read: ["body","This is explicitly t"]
|
||||
read: ["body","yped plain ASCII tex"]
|
||||
read: ["body","t.\nIt DOES end with "]
|
||||
read: ["body","a linebreak.\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 6: example from RFC 1521, using the default chunk size
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new()
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=simple boundary
|
||||
--- request eval
|
||||
qq{POST /t
|
||||
This is the preamble. It is to be ignored, though it
|
||||
is a handy place for mail composers to include an
|
||||
explanatory note to non-MIME conformant readers.
|
||||
--simple boundary\r
|
||||
\r
|
||||
This is implicitly typed plain ASCII text.
|
||||
It does NOT end with a linebreak.\r
|
||||
--simple boundary\r
|
||||
Content-type: text/plain; charset=us-ascii\r
|
||||
\r
|
||||
This is explicitly typed plain ASCII text.
|
||||
It DOES end with a linebreak.
|
||||
\r
|
||||
--simple boundary--\r
|
||||
This is the epilogue. It is also to be ignored.
|
||||
|
||||
}
|
||||
|
||||
--- response_body
|
||||
read: ["body","This is implicitly typed plain ASCII text.\nIt does NOT end with a linebreak."]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-type","text/plain; charset=us-ascii","Content-type: text/plain; charset=us-ascii"]]
|
||||
read: ["body","This is explicitly typed plain ASCII text.\nIt DOES end with a linebreak.\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 7: github issue #2: cannot parse boundary - no space before parameter (w/o quotes)
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form, err = upload:new(5)
|
||||
if not form then
|
||||
ngx.say("cannot get form: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data;boundary=---------------------------820127721219505131303151179
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
\r
|
||||
Hello, world\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179--\r
|
||||
}
|
||||
--- response_body
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text/plain","Content-Type: text/plain"]]
|
||||
read: ["body","Hello"]
|
||||
read: ["body",", wor"]
|
||||
read: ["body","ld"]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
|
||||
read: ["body","value"]
|
||||
read: ["body","\r\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 8: github issue #2: cannot parse boundary - no space before parameter (with quotes)
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form, err = upload:new(5)
|
||||
if not form then
|
||||
ngx.say("cannot get form: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data;boundary="---------------------------820127721219505131303151179"
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
\r
|
||||
Hello, world\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179--\r
|
||||
}
|
||||
--- response_body
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text/plain","Content-Type: text/plain"]]
|
||||
read: ["body","Hello"]
|
||||
read: ["body",", wor"]
|
||||
read: ["body","ld"]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
|
||||
read: ["body","value"]
|
||||
read: ["body","\r\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 9: multiple Content-Type headers
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new(5)
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=---------------------------820127721219505131303151179
|
||||
Content-Type: multipart/form-data; boundary=---------------------------820127721219505131303151179
|
||||
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
\r
|
||||
Hello, world\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179--\r
|
||||
}
|
||||
--- response_body
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text/plain","Content-Type: text/plain"]]
|
||||
read: ["body","Hello"]
|
||||
read: ["body",", wor"]
|
||||
read: ["body","ld"]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
|
||||
read: ["body","value"]
|
||||
read: ["body","\r\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 10: long in-part header line
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new(5, 1024) -- max_line_size = 1024
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=---------------------------820127721219505131303151179
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
} . ("Hello, world" x 64) . qq{\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179--\r
|
||||
}
|
||||
--- response_body
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text/plain","Content-Type: text/plain"]]
|
||||
read: ["header","Hello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, worldHello, world"]
|
||||
read: ["header","-----------------------------820127721219505131303151179"]
|
||||
read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
|
||||
read: ["body","value"]
|
||||
read: ["body","\r\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 11: body preserve off
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
local ljson = require "ljson"
|
||||
|
||||
local form = upload:new(5)
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
ngx.say("read: ", ljson.encode({typ, res}))
|
||||
|
||||
ngx.say("remain body: ", ngx.req.get_body_data(), ",", ngx.req.get_body_file())
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=---------------------------820127721219505131303151179
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
\r
|
||||
Hello, world\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179--\r
|
||||
}
|
||||
--- response_body
|
||||
read: ["header",["Content-Disposition","form-data; name=\"file1\"; filename=\"a.txt\"","Content-Disposition: form-data; name=\"file1\"; filename=\"a.txt\""]]
|
||||
read: ["header",["Content-Type","text/plain","Content-Type: text/plain"]]
|
||||
read: ["body","Hello"]
|
||||
read: ["body",", wor"]
|
||||
read: ["body","ld"]
|
||||
read: ["part_end"]
|
||||
read: ["header",["Content-Disposition","form-data; name=\"test\"","Content-Disposition: form-data; name=\"test\""]]
|
||||
read: ["body","value"]
|
||||
read: ["body","\r\n"]
|
||||
read: ["part_end"]
|
||||
read: ["eof"]
|
||||
read: ["eof"]
|
||||
remain body: nil,nil
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
||||
|
||||
|
||||
=== TEST 12: body preserve on
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local original_len = ngx.req.get_headers()["Content-Length"]
|
||||
local upload = require "resty.upload"
|
||||
|
||||
local form = upload:new(5, nil, true)
|
||||
|
||||
form:set_timeout(1000) -- 1 sec
|
||||
|
||||
while true do
|
||||
local typ, res, err = form:read()
|
||||
if not typ then
|
||||
ngx.say("failed to read: ", err)
|
||||
return
|
||||
end
|
||||
|
||||
if typ == "eof" then
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local typ, res, err = form:read()
|
||||
|
||||
local body = ngx.req.get_body_data()
|
||||
local new_len
|
||||
if body then
|
||||
new_len = #body
|
||||
else
|
||||
new_len = io.open(ngx.req.get_body_file(), "r"):seek("end")
|
||||
end
|
||||
ngx.say("content_length: ", original_len)
|
||||
ngx.say("remain body length: ", new_len)
|
||||
';
|
||||
}
|
||||
--- more_headers
|
||||
Content-Type: multipart/form-data; boundary=---------------------------820127721219505131303151179
|
||||
--- request eval
|
||||
qq{POST /t\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="file1"; filename="a.txt"\r
|
||||
Content-Type: text/plain\r
|
||||
\r
|
||||
Hello, world\r\n-----------------------------820127721219505131303151179\r
|
||||
Content-Disposition: form-data; name="test"\r
|
||||
\r
|
||||
value\r
|
||||
\r\n-----------------------------820127721219505131303151179--\r
|
||||
}
|
||||
--- response_body
|
||||
content_length: 336
|
||||
remain body length: 336
|
||||
|
||||
--- no_error_log
|
||||
[error]
|
40
src/deps/src/lua-resty-upload/t/version.t
Normal file
40
src/deps/src/lua-resty-upload/t/version.t
Normal file
|
@ -0,0 +1,40 @@
|
|||
# vim:set ft= ts=4 sw=4 et:
|
||||
|
||||
use Test::Nginx::Socket::Lua;
|
||||
use Cwd qw(cwd);
|
||||
|
||||
repeat_each(2);
|
||||
|
||||
plan tests => repeat_each() * (3 * blocks());
|
||||
|
||||
my $pwd = cwd();
|
||||
|
||||
our $HttpConfig = qq{
|
||||
lua_package_path "$pwd/lib/?.lua;;";
|
||||
};
|
||||
|
||||
$ENV{TEST_NGINX_RESOLVER} = '8.8.8.8';
|
||||
|
||||
no_long_string();
|
||||
#no_diff();
|
||||
|
||||
run_tests();
|
||||
|
||||
__DATA__
|
||||
|
||||
=== TEST 1: basic
|
||||
--- http_config eval: $::HttpConfig
|
||||
--- config
|
||||
location /t {
|
||||
content_by_lua '
|
||||
local upload = require "resty.upload"
|
||||
ngx.say(upload._VERSION)
|
||||
';
|
||||
}
|
||||
--- request
|
||||
GET /t
|
||||
--- response_body_like chop
|
||||
^\d+\.\d+$
|
||||
--- no_error_log
|
||||
[error]
|
||||
|
379
src/deps/src/lua-resty-upload/valgrind.suppress
Normal file
379
src/deps/src/lua-resty-upload/valgrind.suppress
Normal file
|
@ -0,0 +1,379 @@
|
|||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Param
|
||||
write(buf)
|
||||
fun:__write_nocancel
|
||||
fun:ngx_log_error_core
|
||||
fun:ngx_resolver_read_response
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Cond
|
||||
fun:ngx_sprintf_num
|
||||
fun:ngx_vslprintf
|
||||
fun:ngx_log_error_core
|
||||
fun:ngx_resolver_read_response
|
||||
fun:ngx_epoll_process_events
|
||||
fun:ngx_process_events_and_timers
|
||||
fun:ngx_single_process_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Addr1
|
||||
fun:ngx_vslprintf
|
||||
fun:ngx_snprintf
|
||||
fun:ngx_sock_ntop
|
||||
fun:ngx_event_accept
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Param
|
||||
write(buf)
|
||||
fun:__write_nocancel
|
||||
fun:ngx_log_error_core
|
||||
fun:ngx_resolver_read_response
|
||||
fun:ngx_event_process_posted
|
||||
fun:ngx_process_events_and_timers
|
||||
fun:ngx_single_process_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Cond
|
||||
fun:ngx_sprintf_num
|
||||
fun:ngx_vslprintf
|
||||
fun:ngx_log_error_core
|
||||
fun:ngx_resolver_read_response
|
||||
fun:ngx_event_process_posted
|
||||
fun:ngx_process_events_and_timers
|
||||
fun:ngx_single_process_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
obj:*
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
exp-sgcheck:SorG
|
||||
fun:ngx_http_lua_ndk_set_var_get
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
exp-sgcheck:SorG
|
||||
fun:ngx_http_variables_init_vars
|
||||
fun:ngx_http_block
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
exp-sgcheck:SorG
|
||||
fun:ngx_conf_parse
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
exp-sgcheck:SorG
|
||||
fun:ngx_vslprintf
|
||||
fun:ngx_log_error_core
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_calloc
|
||||
fun:ngx_event_process_init
|
||||
}
|
||||
{
|
||||
<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:ngx_conf_flush_files
|
||||
fun:ngx_single_process_cycle
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Cond
|
||||
fun:memcpy
|
||||
fun:ngx_vslprintf
|
||||
fun:ngx_log_error_core
|
||||
fun:ngx_http_charset_header_filter
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Param
|
||||
socketcall.setsockopt(optval)
|
||||
fun:setsockopt
|
||||
fun:drizzle_state_connect
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_pool_cleanup_add
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Cond
|
||||
fun:ngx_conf_flush_files
|
||||
fun:ngx_single_process_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_array_push
|
||||
fun:ngx_http_get_variable_index
|
||||
fun:ngx_http_memc_add_variable
|
||||
fun:ngx_http_memc_init
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_event_process_init
|
||||
fun:ngx_single_process_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_crc32_table_init
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_event_process_init
|
||||
fun:ngx_worker_process_init
|
||||
fun:ngx_worker_process_cycle
|
||||
fun:ngx_spawn_process
|
||||
fun:ngx_start_worker_processes
|
||||
fun:ngx_master_process_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_pcalloc
|
||||
fun:ngx_hash_init
|
||||
fun:ngx_http_variables_init_vars
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_pcalloc
|
||||
fun:ngx_http_upstream_drizzle_create_srv_conf
|
||||
fun:ngx_http_upstream
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_pcalloc
|
||||
fun:ngx_hash_keys_array_init
|
||||
fun:ngx_http_variables_add_core_vars
|
||||
fun:ngx_http_core_preconfiguration
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_array_push
|
||||
fun:ngx_hash_add_key
|
||||
fun:ngx_http_add_variable
|
||||
fun:ngx_http_echo_add_variables
|
||||
fun:ngx_http_echo_handler_init
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_pcalloc
|
||||
fun:ngx_http_upstream_drizzle_create_srv_conf
|
||||
fun:ngx_http_core_server
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_pcalloc
|
||||
fun:ngx_http_upstream_drizzle_create_srv_conf
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_array_push
|
||||
fun:ngx_hash_add_key
|
||||
fun:ngx_http_variables_add_core_vars
|
||||
fun:ngx_http_core_preconfiguration
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_pcalloc
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_hash_init
|
||||
fun:ngx_http_upstream_init_main_conf
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_pcalloc
|
||||
fun:ngx_http_drizzle_keepalive_init
|
||||
fun:ngx_http_upstream_drizzle_init
|
||||
fun:ngx_http_upstream_init_main_conf
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:ngx_alloc
|
||||
fun:ngx_palloc_large
|
||||
fun:ngx_palloc
|
||||
fun:ngx_hash_init
|
||||
fun:ngx_http_variables_init_vars
|
||||
fun:ngx_http_block
|
||||
fun:ngx_conf_parse
|
||||
fun:ngx_init_cycle
|
||||
fun:main
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck:Cond
|
||||
fun:index
|
||||
fun:expand_dynamic_string_token
|
||||
fun:_dl_map_object
|
||||
fun:map_doit
|
||||
fun:_dl_catch_error
|
||||
fun:do_preload
|
||||
fun:dl_main
|
||||
fun:_dl_sysdep_start
|
||||
fun:_dl_start
|
||||
}
|
||||
{
|
||||
<insert_a_suppression_name_here>
|
||||
Memcheck: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
|
||||
}
|
Loading…
Reference in a new issue