Commit graph

2992 commits

Author SHA1 Message Date
yugui
d97f1d3b37 merges r30475 from trunk into ruby_1_9_2.
--
* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
  should not be included in JSON mapping

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:34:53 +00:00
yugui
e94bc25729 merges r30467 from trunk into ruby_1_9_2.
--
* ext/stringio/stringio.c (get_strio, strio_set_string)
  (strio_reopen): check if frozen.  [ruby-core:33648]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:34:45 +00:00
yugui
b5d29771b9 merges r30452 from trunk into ruby_1_9_2.
--
* lib/net/http.rb (Net::HTTP#get): A header hash given should not
  be modified.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:34:40 +00:00
yugui
e58b0f52b0 merges r30448 and r30498 from trunk into ruby_1_9_2.
--

* lib/irb/locale.rb (IRB::Locale#search_file): make it possible
  to load a localization from a gem.
  (IRB::Locale#lc_path): obsoleted because of the change of #search_file
  (IRB::Locale#each_localized_path): new private method, based on lc_path
  (IRB::Locale#find): follows the change of #search_file.
  (IRB::Locale#load): removed duplicate with #find.
--
* lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
  some platoform has a locale without territory but with
  encoding.
  (#each_sub_locale): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:34:36 +00:00
yugui
67cabb2f17 merges r30435 from trunk into ruby_1_9_2.
--
* vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
  patched by Peter Weldon <peter.weldon AT null.net>
  [ruby-core:33985]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:34:32 +00:00
yugui
66fd410332 merges r30407 and r30450 from trunk into ruby_1_9_2.
--
* ext/fiddle/extconf.rb: check for windows.h while building fiddle.
  Thanks Jon Forums! [ruby-core:33923]
--
* Use _WIN32 rather than checking for windows.h.  Thanks Jon Forums!
  [ruby-core:33977]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 06:30:33 +00:00
yugui
27f15990ad merges r30381 from trunk into ruby_1_9_2.
--
* parse.y (stmt): missing ripper rule.  i.e., `a::B ||= c 1'.
  1879757639
  1879841615

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 06:30:28 +00:00
yugui
85e99f1d43 merges r30377 from trunk into ruby_1_9_2.
--
* ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
  Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 06:30:22 +00:00
yugui
60ae3101a1 merges r30351 from trunk into ruby_1_9_2.
--
* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
  suite writing to the source directory.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 06:30:18 +00:00
yugui
3143c6d381 merges r30349 from trunk into ruby_1_9_2.
--
* io.c (rb_io_extract_encoding_option): accept Encoding object as
  encoding: optional argument.  [ruby-dev:42884]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 06:30:14 +00:00
yugui
81704536a4 merges r30330 from trunk into ruby_1_9_2.
--
update doc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 06:30:11 +00:00
svn
9638cd5bbc * 2010-12-25
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-25 09:37:29 +00:00
yugui
6223c55b57 merges r30350 from trunk into ruby_1_9_2.
--
    * ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
      We must reinitialize GVL when new process creation. Otherwise
      we may meet an insane deadlock. [Bug #4121][ruby-dev:42686]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-25 09:37:26 +00:00
yugui
5be97645b4 merges r29197 from trunk into ruby_1_9_2.
--
        * ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
          blocked on Windows while blocking call for SSLSocket.  Need to 
          convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.  
          Patch by arton. ref #3794.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-24 03:24:00 +00:00
yugui
bab6596652 * version.h: forgotten increasing patch level at r30331.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-24 03:23:57 +00:00
svn
939935efaa * 2010-12-24
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-24 03:20:34 +00:00
yugui
2b862ea95c * common.mk, win32/Makefile.sub: fixes dependencies.
patch by nobu.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 14:30:50 +00:00
yugui
859ed45350 * io.c (io_fillbuf): fixes a mistake on merging r30280, at r30321.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 13:31:37 +00:00
yugui
c2e1f019ee merges r30295,r30298 and r30299 from trunk into ruby_1_9_2.
--
adding tests for the SMTP response parser
--
adding more tests for Net::SMTP::Response class
--
adding tests for Net::SMTP::Response#exception_class

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:46:02 +00:00
yugui
6e210138d8 merges r30294 from trunk into ruby_1_9_2.
--
* lib/net/smtp.rb: Net::SMTP should close the SSL connection if the
  connection verification fails.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:59 +00:00
yugui
a8b6a6f331 merges r30284 from trunk into ruby_1_9_2.
--
* test/rexml/test_contrib.rb (ContribTester#test_pos): should not
  use fixed path name for tests.  [ruby-dev:42827]
* test/rexml/test_sax.rb (SAX2Tester#test_socket): should not use
  fixed port for tests.  [ruby-dev:42828]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:53 +00:00
yugui
a4610baeee merges r30280 from trunk into ruby_1_9_2.
--
	* io.c : add an extra byte to buffer for the specification of read
	  in Windows. see [ruby-core:33460] and r29980. and, we have to
	  discuss how to do this one byte.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:47 +00:00
yugui
6a1ab2d311 merges r30213 from trunk into ruby_1_9_2.
--
        * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
	  fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
	  Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:44 +00:00
yugui
5ef68cb63f merges r30169 and r30170 from trunk into ruby_1_9_2.
--
* ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
  [ruby-dev:42716] [Ruby 1.9-Bug#4129]

* ext/tk/lib/multi-tk.rb: when no eventloop is running, ruby freezes at exit.
--
add an entry.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:38 +00:00
yugui
d80452a183 merges r30147 from trunk into ruby_1_9_2.
--
* test/irb/test_option.rb (test_end_of_option): don't read .irbrc.  Bug#4138

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:32 +00:00
yugui
243faf286f merges r30122 from trunk into ruby_1_9_2.
--
	* io.c (io_read): duplicate string if shared. [ruby-dev:42719]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:26 +00:00
yugui
929bdcabf7 merges r30117 from trunk into ruby_1_9_2.
--
* lib/rexml/light/node.rb: remove circular require.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:22 +00:00
yugui
1f849b54fb merges r30112 from trunk into ruby_1_9_2.
--
* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
  patched by Kouhei Yanagita [ruby-dev:42696]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:17 +00:00
yugui
57eb317045 merges r30104 from trunk into ruby_1_9_2.
--
	* win32/win32.c (rb_w32_read): fixed more for readline, and so on. [ruby-core:33511]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:13 +00:00
yugui
461b1452da merges r30094 from trunk into ruby_1_9_2.
--
* test/ruby/test_string.rb (TestString#test_scan): add a test for
  [ruby-core:33338] #4087.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 12:45:09 +00:00
yugui
7869d38b46 merges r30304 from trunk into ruby_1_9_2.
--

* test/net/imap/cacert.pem: updated because it has been expired.

* test/net/imap/server.crt: signed again because CA cert was expired.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 10:49:30 +00:00
yugui
b3ae334e1d merges r30086 from trunk into ruby_1_9_2.
--
* class.c (make_metaclass): fix probable typo.  builtin type flag
  cannot be used with FL_TEST.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 10:49:25 +00:00
yugui
06dc853ab8 merges r30085 from trunk into ruby_1_9_2.
--
* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 10:49:20 +00:00
yugui
9afa601a90 merges r30084 from trunk into ruby_1_9_2.
--
* ruby.c (load_file_internal): decrement for ungotten line.
  [ruby-dev:42680]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 10:49:13 +00:00
yugui
91c7169daf merges r30063 from trunk into ruby_1_9_2.
--
* ext/stringio/stringio.c (strio_getline): round upto next char
  boundary.  [ruby-dev:42674]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 10:49:07 +00:00
yugui
a46abacacd merges r29980,r30017,r30018,r30019 and r30020 from trunk into ruby_1_9_2.
--
* win32/win32.c (rb_w32_read): read only 1 byte at once on console.
  workaround of Windows bug. see [ruby-core:33460].
  this is not the final solution.
--
* win32/win32.c (rb_w32_read): workaround for console reading troubles.
  fixed [ruby-core:33511]
--
* win32/win32.c (rb_w32_read): rollback debug code of previous commit.
--
* win32/win32.c (rb_w43_read): more fix. [ruby-core:33513]
--
* ChangeLog: typo.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 10:49:03 +00:00
yugui
c9d697ab78 merges r29976 from trunk into ruby_1_9_2.
--
* lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion
  by nested repeat operators.  [ruby-core:33464]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 10:49:00 +00:00
yugui
f33246daeb merges r29970 from trunk into ruby_1_9_2.
--
test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
- Removed commented-out options that are no longer under discussion.
- Added two more tests for forthcomming clarifications.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23 10:48:56 +00:00
yugui
32d4fcdc92 merges r29962 from trunk into ruby_1_9_2.
--
* thread_pthread.c (native_cond_*): Check return code.
  (Some OSs except Linux return error code).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:23:17 +00:00
yugui
479bf5e516 merges r29952 from trunk into ruby_1_9_2.
--
* time.c: parenthesize macro arguments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:23:13 +00:00
yugui
d66c22bfde merges r29951 from trunk into ruby_1_9_2.
--
* time.c (leap_year_v_p): fixed typo.  [ruby-dev:42631]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:23:09 +00:00
yugui
ac0a41e929 merges r29932 from trunk into ruby_1_9_2.
--
* re.c (rb_reg_initialize_str): should succeed the taint status from
  the origin. [ruby-core:33338]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:23:06 +00:00
yugui
c870705df4 merges r29885 from trunk into ruby_1_9_2.
--
* vm.c (rb_thread_mark): should mark self in conrol
  frames.  [ruby-core:33289]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:23:02 +00:00
yugui
cc3a7df13b merges r29630 from trunk into ruby_1_9_2.
--
* iseq.c (iseq_s_compile): fix optional argument.
  a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:59 +00:00
yugui
26879c1742 merges most of r29882 from trunk into ruby_1_9_2.
--
added some tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:56 +00:00
yugui
d341834304 merges r29868 and r29872 from trunk into ruby_1_9_2.
--
* string.c (rb_str_inspect): append for each chars instead of bulk
  copy if encoding conversion is needed.  [ruby-core:33283]
--
* string.c (rb_str_inspect): fix for ascii-compatible external
  encoding and different encoding string.  [ruby-core:33283]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:53 +00:00
yugui
0d0636d22c merges r29848 and r29852 from trunk into ruby_1_9_2.
--
* string.c (rb_str_concat): set ENC_CODERANGE_VALID when the
  receiver is 7BIT and the argument is non ASCII.
--
Fix r29848's test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:48 +00:00
yugui
7decd09b62 merges r29840 from trunk into ruby_1_9_2.
--
add dependency(insns.inc) to compile.obj

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:43 +00:00
yugui
35c70b2137 merges r29808 and r29822 from trunk into ruby_1_9_2.; workaround for StringIO.
--
* lib/csv.rb: Upgrading output encoding as needed.  [ruby-core:33135]
--
* lib/csv.rb: Upgrading output encoding with ASCII content
  as needed.  [ruby-core:33229]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:40 +00:00
yugui
0e1cd3e37c merges r29807 from trunk into ruby_1_9_2.
--
* vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-)
  Coverity Scan found this bug.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:36 +00:00