diff options
| author | Loïc Hoguin <[email protected]> | 2012-01-23 07:23:44 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2012-01-23 07:37:49 +0100 |
| commit | b650ef8907355bc0223c2e7412e36c1a07cb0173 (patch) | |
| tree | 08866d287798acbb60605746534fca2b09f3bda7 /include | |
| parent | e68bbfac3455d4062c414cc0d3a785a80c4ac148 (diff) | |
| parent | 528507c7decb2bf2fcbb55a47256011c2ce4bd4b (diff) | |
| download | cowboy-b650ef8907355bc0223c2e7412e36c1a07cb0173.tar.gz cowboy-b650ef8907355bc0223c2e7412e36c1a07cb0173.tar.bz2 cowboy-b650ef8907355bc0223c2e7412e36c1a07cb0173.zip | |
Merge branch 'multipart' of https://github.com/nox/cowboy
Conflicts:
src/cowboy_http_req.erl
test/http_SUITE.erl
Diffstat (limited to 'include')
| -rw-r--r-- | include/http.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/http.hrl b/include/http.hrl index a7355f4..a10b120 100644 --- a/include/http.hrl +++ b/include/http.hrl @@ -66,7 +66,8 @@ meta = [] :: [{atom(), any()}], %% Request body. - body_state = waiting :: waiting | done, + body_state = waiting :: waiting | done | + {multipart, non_neg_integer(), fun()}, buffer = <<>> :: binary(), %% Response. |