feature: new() now accepts an optional 2nd arg to configure the max line size.

Author: Soojin Nam

lib/resty/upload.lua

@@ -13,6 +13,7 @@ local ngx_var = ngx.var
 local _M = { _VERSION = '0.09' }
 
 
+local CHUNK_SIZE = 4096
 local MAX_LINE_SIZE = 512
 
 local STATE_BEGIN = 1
@@ -45,7 +46,7 @@ local function get_boundary()
 end
 
 
-function _M.new(self, chunk_size)
+function _M.new(self, chunk_size, max_line_size)
  local boundary = get_boundary()
 
  -- print("boundary: ", boundary)
@@ -73,7 +74,8 @@ function _M.new(self, chunk_size)
 
  return setmetatable({
  sock = sock,
- size = chunk_size or 4096,
+ size = chunk_size or CHUNK_SIZE,
+ line_size = max_line_size or MAX_LINE_SIZE,
  read2boundary = read2boundary,
  read_line = read_line,
  boundary = boundary,
@@ -95,7 +97,7 @@ end
 local function discard_line(self)
  local read_line = self.read_line
 
- local line, err = read_line(MAX_LINE_SIZE)
+ local line, err = read_line(self.line_size)
  if not line then
  return nil, err
  end
@@ -170,7 +172,7 @@ end
 local function read_header(self)
  local read_line = self.read_line
 
- local line, err = read_line(MAX_LINE_SIZE)
+ local line, err = read_line(self.line_size)
  if err then
  return nil, nil, err
  end

t/sanity.t

@@ -590,3 +590,61 @@ 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 cjson = require "cjson"
+
+ 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: ", cjson.encode({typ, res}))
+
+ if typ == "eof" then
+ break
+ end
+ end
+
+ local typ, res, err = form:read()
+ ngx.say("read: ", cjson.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]
+