diff options
Diffstat (limited to 'lib/webrick')
| -rw-r--r-- | lib/webrick/httpauth/digestauth.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httpproxy.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb index 018989e6dd..98bdbd10c7 100644 --- a/lib/webrick/httpauth/digestauth.rb +++ b/lib/webrick/httpauth/digestauth.rb @@ -312,7 +312,7 @@ module WEBrick def generate_next_nonce(req) now = "%012d" % req.request_time.to_i pk = hexdigest(now, @instance_key)[0,32] - nonce = [now + ":" + pk].pack("m*").chop # it has 60 length of chars. + nonce = [now + ":" + pk].pack("m0") # it has 60 length of chars. nonce end diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index 79a2e8f55b..083720f298 100644 --- a/lib/webrick/httpproxy.rb +++ b/lib/webrick/httpproxy.rb @@ -143,7 +143,7 @@ module WEBrick if proxy = proxy_uri(req, res) proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0" if proxy.userinfo - credentials = "Basic " + [proxy.userinfo].pack("m").delete("\n") + credentials = "Basic " + [proxy.userinfo].pack("m0") end host, port = proxy.host, proxy.port end @@ -294,7 +294,7 @@ module WEBrick if upstream = proxy_uri(req, res) if upstream.userinfo header['proxy-authorization'] = - "Basic " + [upstream.userinfo].pack("m").delete("\n") + "Basic " + [upstream.userinfo].pack("m0") end return upstream end |