diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-11 01:47:12 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-11 01:47:12 +0000 |
| commit | 825f8ab498d5debb7d1b33c8aae9540d9bcef5ef (patch) | |
| tree | 524200a0fe0f599a610b5612be40a6b03854a7b1 /ChangeLog | |
| parent | 192b4dffb75cef7414986de1a72d3bcd6a9507e7 (diff) | |
| download | ruby-825f8ab498d5debb7d1b33c8aae9540d9bcef5ef.tar.gz ruby-825f8ab498d5debb7d1b33c8aae9540d9bcef5ef.tar.xz ruby-825f8ab498d5debb7d1b33c8aae9540d9bcef5ef.zip | |
resolve conflict.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Fri Sep 11 10:38:33 2009 URABE Shyouhei <shyouhei@ruby-lang.org> + + * lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s + to k. A patch from swdyh <youhei@gmail.com> + http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39 + Fri Sep 11 09:45:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * dln.c (aix_loaderror): get rid of using uninitialized value in the |