# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1342979209 -3600
# Node ID 0875c9208580c9fbe691d8d795e48f3e9b897cea
# Parent  6f689c15518619d53d083fcae83c1b432e8fcdbf# Parent  1777271a1ec0c7a67a89a43fb142217f87bfd5b6
Merge Zash with Zash for Zash

diff -r 6f689c155186 -r 0875c9208580 net/http.lua
--- a/net/http.lua	Wed Jul 18 21:18:17 2012 +0200
+++ b/net/http.lua	Sun Jul 22 18:46:49 2012 +0100
@@ -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 @@
 	};
 	
 	if req.userinfo then
-		headers["Authorization"] = "Basic "..mime.b64(req.userinfo);
+		headers["Authorization"] = "Basic "..b64(req.userinfo);
 	end
 
 	if ex then