diff options
author | Emil Renner Berthing <esmil@mailme.dk> | 2012-12-11 23:59:37 +0100 |
---|---|---|
committer | Emil Renner Berthing <esmil@mailme.dk> | 2012-12-17 10:11:06 +0100 |
commit | f25118928aa35861b370a6529c651a28f5c8859b (patch) | |
tree | 63f07f33cd207f947ea43bef5d92f5311b2e758b /lem/http.lua | |
parent | b738f523cc7a56602e07ff54bd11203355a64af9 (diff) | |
download | lem-f25118928aa35861b370a6529c651a28f5c8859b.tar.gz lem-f25118928aa35861b370a6529c651a28f5c8859b.tar.xz lem-f25118928aa35861b370a6529c651a28f5c8859b.zip |
io: rework streams
Diffstat (limited to 'lem/http.lua')
-rw-r--r-- | lem/http.lua | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lem/http.lua b/lem/http.lua index 6dd25b9..8a14961 100644 --- a/lem/http.lua +++ b/lem/http.lua @@ -35,40 +35,40 @@ function http.Request:body() if len <= 0 then return body end if self.headers['Expect'] == '100-continue' then - local ok, err = self.ostream:send('HTTP/1.1 100 Continue\r\n\r\n') + local ok, err = self.client:send('HTTP/1.1 100 Continue\r\n\r\n') if not ok then return nil, err end end local err - body, err = self.istream:read(len) + body, err = self.client:read(len) if not body then return nil, err end return body end function http.Response:body_chunked() - local istream = self.istream + local client = self.client local t, n = {}, 0 local line, err while true do - line, err = istream:read('*l') + line, err = client:read('*l') if not line then return nil, err end local num = tonumber(line, 16) if not num then return nil, 'expectation failed' end if num == 0 then break end - local data, err = istream:read(num) + local data, err = client:read(num) if not data then return nil, err end n = n + 1 t[n] = data - line, err = istream:read('*l') + line, err = client:read('*l') if not line then return nil, err end end - line, err = istream:read('*l') + line, err = client:read('*l') if not line then return nil, err end return t @@ -85,7 +85,7 @@ function http.Response:body() num = tonumber(num) if not num then return nil, 'invalid content length' end - return self.istream:read(num) + return self.client:read(num) end return http |