diff options
| author | Tobias Markmann <tm@ayena.de> | 2009-11-29 21:33:37 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2009-11-29 21:33:37 +0100 |
| commit | f91009f78a46ad74aa62ff487fa297c06a1ae6a3 (patch) | |
| tree | 8ef6302fc66fdc48b4f34f58c3bea877d7ee6bee /net/http.lua | |
| parent | 8db68f17623ad29b25c6b5d757a2fb0b3d3005c6 (diff) | |
| parent | 8fcbba4b0fccb299121083d97cab065e51fba9d1 (diff) | |
| download | prosody-f91009f78a46ad74aa62ff487fa297c06a1ae6a3.tar.gz prosody-f91009f78a46ad74aa62ff487fa297c06a1ae6a3.zip | |
Merge with tip.
Diffstat (limited to 'net/http.lua')
| -rw-r--r-- | net/http.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http.lua b/net/http.lua index 9d2f9b96..34ec11b4 100644 --- a/net/http.lua +++ b/net/http.lua @@ -152,7 +152,7 @@ function request(u, ex, callback) end req.handler, req.conn = server.wrapclient(socket.tcp(), req.host, req.port or 80, listener, "*a"); - req.write = req.handler.write; + req.write = function (...) return req.handler:write(...); end req.conn:settimeout(0); local ok, err = req.conn:connect(req.host, req.port or 80); if not ok and err ~= "timeout" then @@ -200,7 +200,7 @@ end function destroy_request(request) if request.conn then request.handler.close() - listener.disconnect(request.conn, "closed"); + listener.ondisconnect(request.conn, "closed"); end end |