ruby-changes:13093
From: shyouhei <ko1@a...>
Date: Fri, 11 Sep 2009 10:47:26 +0900 (JST)
Subject: [ruby-changes:13093] Ruby:r24841 (trunk): resolve conflict.
shyouhei 2009-09-11 10:47:12 +0900 (Fri, 11 Sep 2009) New Revision: 24841 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24841 Log: resolve conflict. Modified files: trunk/ChangeLog Index: ChangeLog =================================================================== --- ChangeLog (revision 24840) +++ ChangeLog (revision 24841) @@ -1,3 +1,9 @@ +Fri Sep 11 10:38:33 2009 URABE Shyouhei <shyouhei@r...> + + * lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s + to k. A patch from swdyh <youhei@g...> + http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39 + Fri Sep 11 09:45:11 2009 Nobuyoshi Nakada <nobu@r...> * dln.c (aix_loaderror): get rid of using uninitialized value in the -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/