From 32fc3a50676d43f165c00dc3a74dd01e475238a0 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 7 Jul 2012 23:22:15 +0200 Subject: net.http: Use base64 from util.encodings instead of luasocket --- net/http.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/http.lua') 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 -- cgit v1.2.3 From 16d3a8809791d5f038782617779466cc4f9321ae Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 22 Jul 2012 16:54:58 +0100 Subject: net.http: Don't call ondisconnect manually, net.server now calls it on close --- net/http.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'net/http.lua') diff --git a/net/http.lua b/net/http.lua index f2061e00..02f3a265 100644 --- a/net/http.lua +++ b/net/http.lua @@ -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 -- cgit v1.2.3