ruby-changes:41851
From: usa <ko1@a...>
Date: Thu, 25 Feb 2016 17:59:29 +0900 (JST)
Subject: [ruby-changes:41851] usa:r53925 (ruby_2_1): merge revision(s) 53299: [Backport #11870]
usa 2016-02-25 18:00:06 +0900 (Thu, 25 Feb 2016) New Revision: 53925 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53925 Log: merge revision(s) 53299: [Backport #11870] fix common misspelling [ci skip] compile.c, cont.c, doc, man: fix common misspelling. [Bug #11870] Modified directories: branches/ruby_2_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/cont.c branches/ruby_2_1/doc/ChangeLog-1.8.0 branches/ruby_2_1/doc/ChangeLog-1.9.3 branches/ruby_2_1/doc/ChangeLog-YARV branches/ruby_2_1/ext/tk/lib/tkextlib/SUPPORT_STATUS branches/ruby_2_1/ext/tk/sample/demos-en/combo.rb branches/ruby_2_1/ext/tk/sample/demos-en/rolodex branches/ruby_2_1/ext/tk/sample/demos-jp/rolodex branches/ruby_2_1/ext/tk/sample/tkextlib/blt/pareto.rb branches/ruby_2_1/ext/tk/sample/tkextlib/tkHTML/page4/index.html branches/ruby_2_1/include/ruby/version.h branches/ruby_2_1/test/net/http/test_http.rb branches/ruby_2_1/test/openssl/test_config.rb branches/ruby_2_1/test/rexml/test_core.rb branches/ruby_2_1/test/webrick/test_httpserver.rb branches/ruby_2_1/version.h Index: ruby_2_1/doc/ChangeLog-YARV =================================================================== --- ruby_2_1/doc/ChangeLog-YARV (revision 53924) +++ ruby_2_1/doc/ChangeLog-YARV (revision 53925) @@ -2428,7 +2428,7 @@ Sun Dec 31 17:42:05 2006 Koichi Sasada https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-YARV#L2428 2006-02-14(Tue) 05:53:56 +0900 Minero Aoki <aamine@l...> * eval.c (ruby_cleanup): th->errinfo contains a NODE while - break'ing, check it before refering klass. + break'ing, check it before referring klass. 2006-02-14(Tue) 05:45:07 +0900 Koichi Sasada <ko1@a...> @@ -2461,7 +2461,7 @@ Sun Dec 31 17:42:05 2006 Koichi Sasada https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-YARV#L2461 2006-02-14(Tue) 01:42:11 +0900 Koichi Sasada <ko1@a...> - * error.c : fix include file positon + * error.c : fix include file position * test/ruby/test_signal.rb : skip test_exit_action on cygwin @@ -6168,7 +6168,7 @@ Sun Dec 31 17:42:05 2006 Koichi Sasada https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-YARV#L6168 * test.rb : restore $" after evaluation with ruby - * rb/insns2vm.rb : remove unnecesary each + * rb/insns2vm.rb : remove unnecessary each 2004-12-17(Fri) 18:56:38 +0900 Koichi Sasada <ko1@a...> @@ -6397,7 +6397,7 @@ Sun Dec 31 17:42:05 2006 Koichi Sasada https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-YARV#L6397 * vm.c : fix stack dump routine - * vm.c : impliment thread_funcall (temporarily) + * vm.c : implement thread_funcall (temporarily) * yarv.h : add IS_YARV_WORKING(), SET_YARV_START(), SET_YARV_STOP() @@ -6590,7 +6590,7 @@ Sun Dec 31 17:42:05 2006 Koichi Sasada https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-YARV#L6590 * yarvcore.h, yarvcore.c : add idThrow* * insns.def, compile.c, vm.c : support retry, break, - next, redo, return(imcomplete) + next, redo, return(incomplete) 2004-09-03(Fri) 13:40:08 +0900 Koichi Sasada <ko1@a...> Index: ruby_2_1/doc/ChangeLog-1.8.0 =================================================================== --- ruby_2_1/doc/ChangeLog-1.8.0 (revision 53924) +++ ruby_2_1/doc/ChangeLog-1.8.0 (revision 53925) @@ -1454,7 +1454,7 @@ Fri Jun 27 03:24:54 2003 Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.8.0#L1454 Thu Jun 26 21:34:49 2003 Nobuyoshi Nakada <nobu.nokada@s...> * class.c (class_instance_method_list): get rid of warning about - arguement type mismatch, and inline method_list(). + argument type mismatch, and inline method_list(). [ruby-core:01198] Wed Jun 25 14:40:33 2003 Hidetoshi NAGAI <nagai@a...> @@ -3361,7 +3361,7 @@ Fri Apr 11 02:41:35 2003 Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.8.0#L3361 Thu Apr 10 21:12:19 2003 Minero Aoki <aamine@l...> - * lib/net/pop.rb: Exception line was accidentaly removed. + * lib/net/pop.rb: Exception line was accidentally removed. [ruby-dev:19989] Thu Apr 10 18:42:13 2003 Tadayoshi Funaba <tadf@d...> @@ -5986,7 +5986,7 @@ Thu Nov 7 09:51:37 2002 Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.8.0#L5986 Wed Nov 6 16:57:06 2002 Yukihiro Matsumoto <matz@r...> * class.c (rb_define_method): do not set NOEX_CFUNC if klass is - really a module, whose methods must be safe for reciever's type. + really a module, whose methods must be safe for receiver's type. * eval.c (rb_eval): nosuper should not be inherited unless the overwritten method is an undef placeholder. Index: ruby_2_1/doc/ChangeLog-1.9.3 =================================================================== --- ruby_2_1/doc/ChangeLog-1.9.3 (revision 53924) +++ ruby_2_1/doc/ChangeLog-1.9.3 (revision 53925) @@ -3541,7 +3541,7 @@ Sun May 15 23:45:11 2011 KOSAKI Motohir https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L3541 Sun May 15 22:26:39 2011 CHIKANAGA Tomoyuki <nagachika00@g...> * signal.c (rb_f_kill): accept '-SIGXXX' style signal with Symbol or - implicit convertion with #to_str. [ruby-dev:43169] fixes #4362 + implicit conversion with #to_str. [ruby-dev:43169] fixes #4362 * test/ruby/test_signal.rb (test_signal_process_group): add a test for send signal to process group. @@ -8041,7 +8041,7 @@ Sat Dec 25 17:33:55 2010 Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L8041 anonymous classes. * lib/csv.rb (CSV#init_separators): use IO#gets with length - parameter to get rid of wrong convertion. + parameter to get rid of wrong conversion. * lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding @@ -8382,7 +8382,7 @@ Tue Dec 14 14:24:15 2010 NAKAMURA Usaku https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L8382 to 'test_io' because the old one is meaningless and inconvenient. * test/ruby/test_io.rb (test_binmode_after_closed): the temporary file - maked by make_temfile is already closed. + made by make_temfile is already closed. Tue Dec 14 13:52:19 2010 NAKAMURA Usaku <usa@r...> @@ -22363,7 +22363,7 @@ Tue Sep 29 22:19:36 2009 Tanaka Akira https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L22363 Tue Sep 29 21:16:35 2009 NARUSE, Yui <naruse@r...> - * io.c (rb_scan_open_args): add UTF8-MAC to no-convertion encoding. + * io.c (rb_scan_open_args): add UTF8-MAC to no-conversion encoding. Tue Sep 29 21:21:15 2009 Nobuyoshi Nakada <nobu@r...> @@ -33712,7 +33712,7 @@ Thu Dec 25 14:51:43 2008 NAKAMURA Usaku https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L33712 Thu Dec 25 14:32:23 2008 Koichi Sasada <ko1@a...> * vm_insnhelper.c (vm_method_search): fix control flow bug. - (commited at r20981) + (committed at r20981) Thu Dec 25 13:28:20 2008 NAKAMURA Usaku <usa@r...> @@ -71774,7 +71774,7 @@ Wed Mar 1 17:13:37 2006 Yukihiro Matsu https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L71774 Thu Mar 2 17:54:45 2006 Hirokazu Yamamoto <ocean@m...> - * gc.c: commited magic for reducing RVALUE size on windows. (24->20byte) + * gc.c: committed magic for reducing RVALUE size on windows. (24->20byte) [ruby-core:7474] Thu Mar 2 14:12:26 2006 Tanaka Akira <akr@m...> @@ -73761,7 +73761,7 @@ Fri Oct 21 15:42:28 2005 Hirokazu Yamam https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L73761 * ext/socket/extconf.rb: BeOS is only one platform should call closesocket, so check __BEOS__ macro directly. (I was worried - accidently HAVE_CLOSESOCKET is defined on windows again because + accidentally HAVE_CLOSESOCKET is defined on windows again because it has it) * ext/socket/{getaddrinfo.c,socket.c}: ditto. @@ -73770,7 +73770,7 @@ Fri Oct 21 15:42:28 2005 Hirokazu Yamam https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L73770 Fri Oct 21 15:23:23 2005 Hirokazu Yamamoto <ocean@m...> - * bignum.c (bignew_1): convertion from `int' to `char' discards + * bignum.c (bignew_1): conversion from `int' to `char' discards upper bits, (ie. (char)0xff00 -> 0) so it's better to test if nonzero and set 0 or 1 instead of simply casting ... as a flag usage. (but I believe this won't cause actual bug in current implementation) @@ -74937,7 +74937,7 @@ Mon Sep 12 20:32:00 2005 Hirokazu Yamam https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L74937 Mon Sep 12 19:58:53 2005 Hirokazu Yamamoto <ocean@m...> - * dln.c: avoid warning of const to non-const convertion. + * dln.c: avoid warning of const to non-const conversion. [ruby-dev:27041] * eval.c, io.c, ruby.c: ditto. @@ -83155,7 +83155,7 @@ Thu Aug 19 16:29:45 2004 Hidetoshi NAGA https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L83155 * ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option. - * ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation. + * ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion information. * ext/tk/lib/menu.rb: typo bug. @@ -83584,7 +83584,7 @@ Wed Jul 14 18:05:21 2004 GOTOU Yuuzou https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L83584 Wed Jul 14 12:20:05 2004 Hirokazu Yamamoto <ocean@m...> * util.c (ruby_strtod): should not convert string in the form of - "-I.FE-X" which both "I" and "F" are ommitted. [ruby-dev:23883] + "-I.FE-X" which both "I" and "F" are omitted. [ruby-dev:23883] * test/ruby/test_float.rb (test_strtod): add test for bug fix. @@ -84298,7 +84298,7 @@ Sat May 22 11:54:10 2004 Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L84298 Sat May 22 05:37:11 2004 Hidetoshi NAGAI <nagai@a...> - * ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters + * ext/tk/lib/remote-tk.rb: (NEW library) control Tk interpreters on the other processes by Tcl/Tk's 'send' command Fri May 21 09:22:05 2004 Dave Thomas <dave@p...> @@ -85607,10 +85607,10 @@ Wed Mar 17 00:22:03 2004 Kazuo Saito < https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L85607 Tue Mar 16 11:14:17 2004 Hirokazu Yamamoto <ocean@m...> * dir.c (fnmatch_helper): File.fnmatch('\.', '.') should return true. - (Rev1.112 lost compatiblity) + (Rev1.112 lost compatibility) * dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME) - should return true. (Rev1.112 lost compatiblity) + should return true. (Rev1.112 lost compatibility) * dir.c (fnmatch): File.fnmatch('**/.boo', '.foo/.boo', File::FNM_PATHNAME) should return false because of leading period. @@ -86434,7 +86434,7 @@ Mon Feb 16 22:22:00 2004 Gavin Sinclair https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L86434 Mon Feb 16 20:28:52 2004 Hirokazu Yamamoto <ocean@m...> - * bcc32/Makefile.sub: show more warnings. (refering to mingw) + * bcc32/Makefile.sub: show more warnings. (referring to mingw) * bcc32/setup.mak: ditto. @@ -86492,7 +86492,7 @@ Mon Feb 16 12:29:10 2004 Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L86492 Mon Feb 16 10:29:52 2004 Hirokazu Yamamoto <ocean@m...> * dir.c (CompareImpl): File.fnmatch and Dir.glob get better performance - in Win32. This is achived by calling downcase() for single-byte + in Win32. This is achieved by calling downcase() for single-byte characters. (CharLower() is slower than downcase()) Mon Feb 16 02:14:29 2004 Hirokazu Yamamoto <ocean@m...> @@ -86561,7 +86561,7 @@ Sat Feb 14 11:14:12 2004 Masatoshi SEKI https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L86561 Fri Feb 13 21:51:00 2004 Gavin Sinclair <gsinclair@s...> - * lib/fileutils.rb: slighly improved documentation (sync with 1.8) + * lib/fileutils.rb: slightly improved documentation (sync with 1.8) Fri Feb 13 19:57:01 2004 Kouhei Sutou <kou@c...> @@ -89179,7 +89179,7 @@ Thu Nov 27 22:05:48 2003 Akinori MUSHA https://github.com/ruby/ruby/blob/trunk/ruby_2_1/doc/ChangeLog-1.9.3#L89179 Thu Nov 27 17:36:42 2003 Hidetoshi NAGAI <nagai@a...> * ext/tk/lib/tkafter.rb: bug fix on TkTimer#cancel_on_exception=(mode). - TkTimer#wait recieves the exception of the callback. + TkTimer#wait receives the exception of the callback. The exception is kept on @return_value. Thu Nov 27 16:58:48 2003 WATANABE Hirofumi <eban@r...> Index: ruby_2_1/cont.c =================================================================== --- ruby_2_1/cont.c (revision 53924) +++ ruby_2_1/cont.c (revision 53925) @@ -140,7 +140,7 @@ typedef struct rb_fiber_struct { https://github.com/ruby/ruby/blob/trunk/ruby_2_1/cont.c#L140 * then this fiber can't "resume" any more after that. * You shouldn't mix "transfer" and "resume". */ - int transfered; + int transferred; #if FIBER_USE_NATIVE #ifdef _WIN32 @@ -1485,7 +1485,7 @@ rb_fiber_resume(VALUE fibval, int argc, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/cont.c#L1485 if (fib->prev != Qnil || fib->cont.type == ROOT_FIBER_CONTEXT) { rb_raise(rb_eFiberError, "double resume"); } - if (fib->transfered != 0) { + if (fib->transferred != 0) { rb_raise(rb_eFiberError, "cannot resume transferred Fiber"); } @@ -1599,7 +1599,7 @@ rb_fiber_m_transfer(int argc, VALUE *arg https://github.com/ruby/ruby/blob/trunk/ruby_2_1/cont.c#L1599 { rb_fiber_t *fib; GetFiberPtr(fibval, fib); - fib->transfered = 1; + fib->transferred = 1; return rb_fiber_transfer(fibval, argc, argv); } Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 53924) +++ ruby_2_1/ChangeLog (revision 53925) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Thu Feb 25 17:51:35 2016 Tadashi Saito <tadashi_saito@d...> + + * compile.c, cont.c, doc, man: fix common misspelling. + [ruby-core:72466] [Bug #11870] + Thu Feb 25 17:48:16 2016 Eric Wong <e@8...> * ext/socket/init.c (rsock_init_sock): reject reserved FDs Index: ruby_2_1/ext/tk/lib/tkextlib/SUPPORT_STATUS =================================================================== --- ruby_2_1/ext/tk/lib/tkextlib/SUPPORT_STATUS (revision 53924) +++ ruby_2_1/ext/tk/lib/tkextlib/SUPPORT_STATUS (revision 53925) @@ -4,7 +4,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/tk/lib/tkextlib/SUPPORT_STATUS#L4 *** RELEASE_DATE of the libraries => see 'tkextlib/version.rb' *** The following list shows *CURRENT* status when this file was modified -at last. If you want to add other Tcl/Tk extensions to the planed list +at last. If you want to add other Tcl/Tk extensions to the planned list (or change its status position), please request them at the ruby-talk, ruby-list, or ruby-dev ML. Although we cannot promise to support your requests, we'll try to do. Index: ruby_2_1/ext/tk/sample/demos-en/rolodex =================================================================== --- ruby_2_1/ext/tk/sample/demos-en/rolodex (revision 53924) +++ ruby_2_1/ext/tk/sample/demos-en/rolodex (revision 53925) @@ -284,7 +284,7 @@ $helpTopics["context"] = <<EOF https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/tk/sample/demos-en/rolodex#L284 Unfortunately, this application doesn't support context-sensitive\ help in the usual way, because when this demo was written Ruby/Tk\ didn't have a grab mechanism and this is needed for context-sensitive\ -help. Instead, you can achive much the same effect by simply moving\ +help. Instead, you can achieve much the same effect by simply moving\ the mouse over the window you're curious about and pressing the\ Help or F1 keys. You can do this anytime. EOF Index: ruby_2_1/ext/tk/sample/demos-en/combo.rb =================================================================== --- ruby_2_1/ext/tk/sample/demos-en/combo.rb (revision 53924) +++ ruby_2_1/ext/tk/sample/demos-en/combo.rb (revision 53925) @@ -71,7 +71,7 @@ australianCities = [ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/tk/sample/demos-en/combo.rb#L71 ] -secondValue.value = 'unchangable' +secondValue.value = 'unchangeable' ozCity.value = 'Sydney' Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f| Index: ruby_2_1/ext/tk/sample/demos-jp/rolodex =================================================================== --- ruby_2_1/ext/tk/sample/demos-jp/rolodex (revision 53924) +++ ruby_2_1/ext/tk/sample/demos-jp/rolodex (revision 53925) @@ -284,7 +284,7 @@ $helpTopics["context"] = <<EOF https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/tk/sample/demos-jp/rolodex#L284 Unfortunately, this application doesn't support context-sensitive\ help in the usual way, because when this demo was written Ruby/Tk\ didn't have a grab mechanism and this is needed for context-sensitive\ -help. Instead, you can achive much the same effect by simply moving\ +help. Instead, you can achieve much the same effect by simply moving\ the mouse over the window you're curious about and pressing the\ Help or F1 keys. You can do this anytime. EOF Index: ruby_2_1/ext/tk/sample/tkextlib/tkHTML/page4/index.html =================================================================== --- ruby_2_1/ext/tk/sample/tkextlib/tkHTML/page4/index.html (revision 53924) +++ ruby_2_1/ext/tk/sample/tkextlib/tkHTML/page4/index.html (revision 53925) @@ -117,7 +117,7 @@ squelching curiosity." https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/tk/sample/tkextlib/tkHTML/page4/index.html#L117 <B><FONT SIZE="+2">nmpg 1.1.3</FONT></B><BR> <SMALL><B><A HREF="mailto:narkos@l...">Joel Lindau</A> - January 29th 2000, 18:18 EST</B></SMALL> <DIV ALIGN="justify"><P>nmpg is a small command-driven frontend and network-jukebox for mpg123.</DIV> -<P><B>Changes:</B> Bugfixes, better memory managment, a new .nmpgrc parser, and new options. +<P><B>Changes:</B> Bugfixes, better memory management, a new .nmpgrc parser, and new options. <P><B>Urgency:</B> low <P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949187896.html">comments (0)</A> ]</B> </FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle"> Index: ruby_2_1/ext/tk/sample/tkextlib/blt/pareto.rb =================================================================== --- ruby_2_1/ext/tk/sample/tkextlib/blt/pareto.rb (revision 53924) +++ ruby_2_1/ext/tk/sample/tkextlib/blt/pareto.rb (revision 53925) @@ -67,7 +67,7 @@ xdata.zip(ydata){|x, y| https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/tk/sample/tkextlib/blt/pareto.rb#L67 :foreground=>'red4', :anchor=>:center, :yoffset=>-5) } -# Display an auxillary y-axis for percentages. +# Display an auxiliary y-axis for percentages. b.axis_configure('y2', :hide=>false, :min=>0.0, :max=>100.0, :title=>'Percentage') Index: ruby_2_1/include/ruby/version.h =================================================================== --- ruby_2_1/include/ruby/version.h (revision 53924) +++ ruby_2_1/include/ruby/version.h (revision 53925) @@ -13,7 +13,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/include/ruby/version.h#L13 /* * This file contains only - * - never-changable informations, and + * - never-changeable informations, and * - interfaces accessible from extension libraries. * * Never try to check RUBY_VERSION_CODE etc in extension libraries, Index: ruby_2_1/test/openssl/test_config.rb =================================================================== --- ruby_2_1/test/openssl/test_config.rb (revision 53924) +++ ruby_2_1/test/openssl/test_config.rb (revision 53925) @@ -167,7 +167,7 @@ __EOC__ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/openssl/test_config.rb#L167 end def test_value - # supress deprecation warnings + # suppress deprecation warnings OpenSSL::TestUtils.silent do assert_equal('CA_default', @it.value('ca', 'default_ca')) assert_equal(nil, @it.value('ca', 'no such key')) Index: ruby_2_1/test/webrick/test_httpserver.rb =================================================================== --- ruby_2_1/test/webrick/test_httpserver.rb (revision 53924) +++ ruby_2_1/test/webrick/test_httpserver.rb (revision 53925) @@ -344,7 +344,7 @@ class TestWEBrickHTTPServer < Test::Unit https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/webrick/test_httpserver.rb#L344 http.request(req){|res| assert_equal("foo", res.body) } end rescue Timeout::Error - flunk('corrupted reponse') + flunk('corrupted response') end } end Index: ruby_2_1/test/net/http/test_http.rb =================================== (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/