diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
| commit | 81bef2c93b53e006cbeebdffc80040af6b4daf68 (patch) | |
| tree | 2732225257e7b8ade28695dad7c0df3f7cea00b1 /net/http.lua | |
| parent | 8eec29745633bd84c2d325d42dbeeb4afd37d516 (diff) | |
| parent | 47619af14cd24fcb48b4d2b4c4653f72b882087e (diff) | |
| download | prosody-81bef2c93b53e006cbeebdffc80040af6b4daf68.tar.gz prosody-81bef2c93b53e006cbeebdffc80040af6b4daf68.zip | |
Merge with Florob
Diffstat (limited to 'net/http.lua')
| -rw-r--r-- | net/http.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/http.lua b/net/http.lua index f2061e00..273eee09 100644 --- a/net/http.lua +++ b/net/http.lua @@ -7,7 +7,7 @@ -- local socket = require "socket" -local mime = require "mime" +local b64 = require "util.encodings".base64.encode; local url = require "socket.url" local httpstream_new = require "util.httpstream".new; @@ -154,7 +154,7 @@ function request(u, ex, callback) }; if req.userinfo then - headers["Authorization"] = "Basic "..mime.b64(req.userinfo); + headers["Authorization"] = "Basic "..b64(req.userinfo); end if ex then @@ -203,7 +203,6 @@ function destroy_request(request) if request.conn then request.conn = nil; request.handler:close() - listener.ondisconnect(request.handler, "closed"); end end |