summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/http.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 75a93f8e32..ef5654ae27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 16 03:14:28 2004 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (basic_encode): return value of pack('m') may
+ include multiple CR/LFs. Backported from main trunk (rev 1.112).
+ [ruby-dev:25212]
+
Wed Dec 15 18:48:42 2004 Shugo Maeda <shugo@ruby-lang.org>
* ext/curses/curses.c (window_subwin): call NUM2INT() before
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 39c58dd521..8ae2889843 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1076,7 +1076,7 @@ module Net # :nodoc:
end
def basic_encode(account, password)
- 'Basic ' + ["#{account}:#{password}"].pack('m').strip
+ 'Basic ' + ["#{account}:#{password}"].pack('m').delete("\r\n")
end
private :basic_encode