aboutsummaryrefslogtreecommitdiffstats
path: root/net/http.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-22 18:47:40 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-22 18:47:40 +0100
commit0f2e8a78418d03476741324bfea63be1b7e67712 (patch)
tree382881c66387d07fd1319d767387658017f17ca9 /net/http.lua
parentad5bc731f2c6b1124bcb8f0cc0a1b155a0c7917e (diff)
parentec1d26a8358054f7f00ba4f0c9ee65bc858fb609 (diff)
downloadprosody-0f2e8a78418d03476741324bfea63be1b7e67712.tar.gz
prosody-0f2e8a78418d03476741324bfea63be1b7e67712.zip
Merge with Zash
Diffstat (limited to 'net/http.lua')
-rw-r--r--net/http.lua4
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