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
commitbc01526093dbdef185b78d5a40ee3368074a5644 (patch)
tree1e32f025bf04761396437760b9e96b897ed7c6b3
parentbc2afeeef7f74a98466ba5691eb6c3a45b9665a0 (diff)
parent7b894f50d3a5156fa6f5d5b537d18ab334b78a98 (diff)
downloadprosody-bc01526093dbdef185b78d5a40ee3368074a5644.tar.gz
prosody-bc01526093dbdef185b78d5a40ee3368074a5644.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