diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-22 18:47:40 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-22 18:47:40 +0100 |
| commit | c6b709ed7fa4bab314285473b79b37729ef03863 (patch) | |
| tree | 382881c66387d07fd1319d767387658017f17ca9 /net | |
| parent | f07fe41db1238eaef4efe905f9b136c2d293609e (diff) | |
| parent | bc01526093dbdef185b78d5a40ee3368074a5644 (diff) | |
| download | prosody-c6b709ed7fa4bab314285473b79b37729ef03863.tar.gz prosody-c6b709ed7fa4bab314285473b79b37729ef03863.zip | |
Merge with Zash
Diffstat (limited to 'net')
| -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 02f3a265..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 |