Commit graph

3017 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
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
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
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
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
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
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
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
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
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
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
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
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
139ab718de merges r29804 from trunk into ruby_1_9_2.
--
* pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
  values if block is given.  [ruby-core:33193]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:32 +00:00
yugui
751a5cfa0c merges r29786 from trunk into ruby_1_9_2.
--
Prevent timing failure.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:40 +00:00
yugui
c5089caba9 merges r29784,r29787 and r29788 from trunk into ruby_1_9_2.
--
* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
  pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]
--
STDIN is not valid when ruby doesn't have tty.
--
making ssl test a little better

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:36 +00:00
yugui
40236a58c6 merges r29676 from trunk into ruby_1_9_2.
--
* string.c (rb_enc_cr_str_buf_cat): concatenation of valid
  encoding string and invalid encoding string should result
  invalid encoding.  [ruby-core:33027]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:14 +00:00
yugui
11aa04e28f merges r29632 from trunk into ruby_1_9_2.
--
* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
  group of the created file is inherited from the parent
  directory on BSDs and MacOS X.  Linux also inherit the group if
  the setgid bit of the directory is set.  It causes the test fail.
  fixed by Shota Fukumori.  [ruby-dev:42458]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:06 +00:00
yugui
04bc7dbc8b merges r29622 from trunk into ruby_1_9_2.
--
* string.c (rb_str_dump): fix expected length. [ruby-core:32935]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:02 +00:00
yugui
7231be4c35 merges r29541,r29607,r29608 and r29611 from trunk into ruby_1_9_2.
--
* test/ruby/test_io.rb (TestIO#pipe): get rid of deadlock on pipe.
  a patch from Tomoyuki Chikanaga at [ruby-dev:42435].  #3970

* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
--
* test/ruby/test_io.rb (TestIO#pipe): need to propagate exceptions
  in read/write thread. fix r29541.

* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
--
* ruby/test_io_m17n.rb (TestIO_M17N#pipe): fixed the mistake of previous
  commit.
--
* test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe
  before closing read end, to get rid of timing problem.

* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:08:55 +00:00
yugui
b1d2491fb4 merges r29518 from trunk into ruby_1_9_2.
--
* class.c (rb_define_{class,module}_id_under): register to be
  marked, which probably are defined and used internally.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:41 +00:00
yugui
faeed9b54c merges r29495 from trunk into ruby_1_9_2.
--
* ext/win32ole/win32ole.c (reg_get_val): expand environment in
  the pathname. [Bug #3907]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:28 +00:00
yugui
0672c5fc32 merges r29490 from trunk into ruby_1_9_2.
--
* numeric.c (ruby_float_step): fix Numeric#step with infinity unit
  doesn't works well. [ruby-core:32779]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:24 +00:00
yugui
51f6ed8161 merges r29484 from trunk into ruby_1_9_2.
--
* lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte
  string. Thanks nobu and tDiary dev members. [Bug #3909]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:18 +00:00
yugui
931e3b6a67 merges r29453 from trunk into ruby_1_9_2.
--
* string.c (rb_str_concat): use unsigned int for GB18030.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:58 +00:00
yugui
230b8b524d merges r29446 and r29448 from trunk into ruby_1_9_2.
--
* numeric.c (rb_enc_uint_chr): split from int_chr.

* numeric.c (int_chr): use rb_enc_uint_chr.

* include/ruby/encoding.h (rb_enc_uint_chr): added.
--
* io.c (rb_io_ungetc): use unsigned int for GB18030.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:46 +00:00
yugui
55eecb54e7 merges r29445 from trunk into ruby_1_9_2.
--
* numeric.c (int_chr): a codepoint of Ruby M17N must be 32bit
  unsigned int; GB18030 uses MSB. Also note that OnigCodePoint
  is defined as uisigned int.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:40 +00:00
yugui
dcc316b825 merges r29438 from trunk into ruby_1_9_2.
--
* error.c (syserr_initialize): set the encoding of Errno::*#message
  as locale. [ruby-dev:42358]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30035 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:29 +00:00
yugui
0ce00dce21 merges r29407 from trunk into ruby_1_9_2.
--
* ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new
  accepts only Strings, so call Integer#to_s(16).
  16 is for an optimization. [ruby-dev:42336]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:05:48 +00:00
yugui
404886ce6d merges r29394 from trunk into ruby_1_9_2.
--
test/win32ole/test_thread.rb: add for win32ole with Thread.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:05:38 +00:00
yugui
0a04644bd2 merges r29378 from trunk into ruby_1_9_2.
--
* win32/win32.c (rb_w32_getenv): should return NULL if specified name
  is empty. a patch from Heesob Park at [ruby-core:32650]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:05:33 +00:00
yugui
37309d99a7 merges r29136 from trunk into ruby_1_9_2.
--
* vm.c (rb_thread_method_id_and_class): curried proc has no
  method.  [ruby-core:31871]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:05:28 +00:00
yugui
45ba464561 merges r29335 from trunk into ruby_1_9_2.
--
* string.c (sym_call), vm.c (invoke_block_from_c),
  vm_insnhelper.c (vm_yield_with_cfunc): pass given block.
  [ruby-core:32075]

* vm_eval.c (rb_funcall_passing_block): new function to call
  method with passing given block.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:05:24 +00:00
yugui
cfeb4beeff merges r29316 from trunk into ruby_1_9_2.
--

* test/test_prime.rb (TestPrime#test_new): the warning expected have
  not been displayed when $VERBOSE == nil. Patch by Shota Fukumori
  a.k.a. sora_h. [ruby-dev:42272]
  Recovers $stderr even if StringIO.new fails. Reported by unak.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24 09:37:58 +00:00
yugui
29160356f2 merges r29306 from trunk into ruby_1_9_2.
--
* dir.c (bracket): get rid of scanning at the end of the pattern
  string, not to raise an exception while globbing command line.
  [ruby-core:32478]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24 09:37:36 +00:00
yugui
911692e568 merges r29282,r29283,r29284,r29285,r29286,r29287,r29288 and r29302 from trunk into ruby_1_9_2.
--
* test/rexml/: import REXML tests from
  http://www.germane-software.com/repos/rexml/trunk/test/.
  Many tests are failed temporary. I'll fix them quickly. Sorry.
--
* test/rexml/test_listener.rb: remove needless codes.
--
* test/rexml/: fix fixture data path. All REXML tests are worked.
--
* test/rexml/: untabify.
--
* test/rexml/test_core.rb: enable.
--
* test/rexml/test_sax.rb: don't use thread and sleep to avoid slow test.
--
* lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb:
  add missing method availability check. [ruby-core:32447]
  Reported by Wiebe Cazemier. Thanks!!!
--
Specify external encoding.

When external encoding is not specified, it uses default
external
encoding. But it depends the environment. So specify as
UTF-8 for
environments whose locale is not UTF-8.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24 09:37:27 +00:00
yugui
c53b4f562b merges r29280 from trunk into ruby_1_9_2 and adds a minimal regression
test.
--
* lib/tracer.rb: count only non-internal libraries in stack trace,
  ignoring custom_require.  [ruby-core:31858]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24 09:37:20 +00:00