aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-22 18:46:49 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-22 18:46:49 +0100
commitec1d26a8358054f7f00ba4f0c9ee65bc858fb609 (patch)
tree1e32f025bf04761396437760b9e96b897ed7c6b3
parent1d129f83b6752980f352c576ca64b5ab72c34f69 (diff)
parent32fc3a50676d43f165c00dc3a74dd01e475238a0 (diff)
downloadprosody-ec1d26a8358054f7f00ba4f0c9ee65bc858fb609.tar.gz
prosody-ec1d26a8358054f7f00ba4f0c9ee65bc858fb609.zip
Merge Zash with Zash for Zash
-rw-r--r--net/http.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http.lua b/net/http.lua
index f2061e00..6498f8fa 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