diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-02 22:50:01 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-02 22:50:01 +0000 |
| commit | ce01db512cbb9a7f9e9f9d3e449540f54aee1f78 (patch) | |
| tree | 744d380b07cf85d59237f126c66d984bde9223fd /lib/webrick/httpproxy.rb | |
| parent | bc7c19fba0a63e9d84d4219d646499aff80e8f1e (diff) | |
| download | ruby-ce01db512cbb9a7f9e9f9d3e449540f54aee1f78.tar.gz ruby-ce01db512cbb9a7f9e9f9d3e449540f54aee1f78.tar.xz ruby-ce01db512cbb9a7f9e9f9d3e449540f54aee1f78.zip | |
* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
raise NotImplementedError if password is encrypted by digest
algorithms. This patch is contributed by sheepman. [ruby-list:40467]
* lib/webrick/httpauth/digestauth.rb
(WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
This patch is contributed by sheepman. [ruby-list:40482]
* lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
pack/unpack-template char "m" instead of lib/base64.rb to do base64
encoding/decoding. fixed: [ruby-dev:25336]
* test/webrick/test_httpauth.rb: new file.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httpproxy.rb')
| -rw-r--r-- | lib/webrick/httpproxy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index 65f830ecb..c5ed44f1d 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 |