summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-02 22:48:59 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-02 22:48:59 +0000
commit239d44a19c2758339a356bc07a411fdbfdd07974 (patch)
treeffb81a27f2acf68983be837eafb48475de3093d8
parent97102f6596e490ea98f0300e34c47061f1e97f85 (diff)
* missed in last commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/webrick/httpproxy.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index 65f830ecbb5..c5ed44f1daf 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -110,7 +110,7 @@ module WEBrick
proxy_host = proxy.host
proxy_port = proxy.port
if proxy.userinfo
- credentials = "Basic " + encode64(proxy.userinfo)
+ credentials = "Basic " + [proxy.userinfo].pack("m*")
header['proxy-authorization'] = credentials
end
end
@@ -170,7 +170,7 @@ module WEBrick
if proxy = proxy_uri(req, res)
proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
if proxy.userinfo
- credentials = "Basic " + encode64(proxy.userinfo)
+ credentials = "Basic " + [proxy.userinfo].pack("m*")
end
host, port = proxy.host, proxy.port
end