Commit graph

3002 commits

Author SHA1 Message Date
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
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
79128855ab merges r29803 from trunk into ruby_1_9_2.
--
* regparse.c (and_cclass, or_cclass): fix memory leak.  Coverity Scan
  found this bug.  [ruby-dev:42579]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:29 +00:00
yugui
b6e3b715dd merges r29800 from trunk into ruby_1_9_2.
--
* eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
  size_t to a pointer typed VALUE*.  Coverity Scan found this defect.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:26 +00:00
yugui
a90f3bcb0c merges r29799 from trunk into ruby_1_9_2.
--
* compile.c (iseq_set_exception_local_table, iseq_set_local_table,
  rb_iseq_build_from_ary): fix type inconsistency (which is benign
  because sizeof(ID) == sizeof(ID*), though).  Coverity Scan found
  these bugs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 13:22:21 +00:00
yugui
c9116c68f4 merges r29798 from trunk into ruby_1_9_2.
--
* vm_eval.c (rb_funcall): ensure va_end after va_init_list.  Coverity
  Scan found this bug.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:44 +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
aeebb6e538 * string.c (rb_str_concat): partially reverts r30040 because
it unpexpectedly changed the behavior of String#<<.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:28 +00:00
yugui
b62f04f5e1 merges r29743 from trunk into ruby_1_9_2.
--
* io.c (pipe_finalize): status is success if no process.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:24 +00:00
yugui
1f87ac7b87 merges r29693 from trunk into ruby_1_9_2.
--
* common.mk (ext/ripper/ripper.c): RUBY needs to be set.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:21 +00:00
yugui
d9f37868d9 merges r29691 from trunk into ruby_1_9_2.
--
* ext/fiddle/extconf.rb: fixing ffi library location on windows.
  Thanks Usa! [ruby-core:32930]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:18 +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
2f7d3b4653 merges r29674 from trunk into ruby_1_9_2.
--
* lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
  regex options.  a patch from Heesob Park in [ruby-core:32988].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:09:11 +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
ee72d1c46c merges r29544 from trunk into ruby_1_9_2.
--
* lib/net/telnet.rb (Net::Telnet#close): added.
  patched by Erik Hollensbe [ruby-dev:42260] #3830

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:08:59 +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
f87402c392 merges r29523 from trunk into ruby_1_9_2.
--
* lib/net/http.rb (transport_request): @socket may be nil.
  patched by Egbert Eich [ruby-core:32829]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-08 08:08:46 +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
27b1ee2773 merges r29517 from trunk into ruby_1_9_2.
--
* ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
  according to GB2312. [Bug #3937] [ruby-core:32758]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:36 +00:00
yugui
8633eacb30 merges r29493,r29494,r29505 and r29509 from trunk into ruby_1_9_2.
--
* file.c (DEVT2NUM): added. Size of dev_t is depend on the
  environment even if POSIX defines dev_t as unsigned integer.
  For example, OpenVMS, 64bit Solaris 9, and NetBSD 6 defines
  dev_t as 64bit unsigned integer.

* file.c (rb_stat_dev): use DEVT2NUM.

* file.c (rb_stat_dev_major): dev_t is not long. major(3)'s return
  value is int.

* file.c (rb_stat_dev_minor): dev_t is not long. minor(3)'s return
  value is int.

* configure.in: check size of dev_t.
--
Refix for r29493; it is unsigned.
--
* configure.in (dev_t): use RUBY_REPLACE_TYPE.

* file.c (rb_stat_inspect): use PRI_DEVT_PREFIX.
--
* file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to
  unsigned int.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:32 +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
ebea538a96 merges r29467 from trunk into ruby_1_9_2.
--
* win32/win32.c (rb_w32_open_osfhandle, rb_w32_wopen, rb_w32_pipe):
  use uintptr_t instead of long for win64.

* win32/win32.c (socketpair_internal): suppress warnings.

* win32/win32.c (ftruncate): use HANDLE instead of long for win64.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:13 +00:00
yugui
0d7d1bb5da merges r29466 from trunk into ruby_1_9_2.
--
* vsnprintf.c (BSD_vfprintf): fix cast.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:08 +00:00
yugui
d589c29331 merges r29454 from trunk into ruby_1_9_2.
--
* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
  may be a Bignum. On 64bit for errors. [ruby-dev:42366]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:07:04 +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
cd50499701 merges r29449 from trunk into ruby_1_9_2.
--
* win32/win32.c (rb_w32_strerror): unmap some range of errno for
  workaround of VC10's strerror() and sys_nerr problem.
  based on a patch from Akio Tajima, [ruby-dev:42355].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:52 +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
f099a11c2a merges r29442 from trunk into ruby_1_9_2.
--
* lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result
  encoding of Zlib::GzipReader.
  1281473294/271

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:35 +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
9b6125398f merges r29435 from trunk into ruby_1_9_2.
--
* io.c (rb_io_set_encoding): use rb_funcall2 when the io is not
  a T_FILE. [ruby-dev:42356]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30034 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:23 +00:00
yugui
93d4433c14 merges r29422 from trunk into ruby_1_9_2.
--
* lib/csv.rb: Fixing documentation typos.  [ruby-core:32712]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:17 +00:00
yugui
e3e9779119 merges r29421 from trunk into ruby_1_9_2.
--
* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
  real config.rb file.  [ruby-core:32709]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:12 +00:00
yugui
15527e52ea merges r29415 from trunk into ruby_1_9_2.
--
* io.c (fptr_finalize): write_mutex might have been destroyed
  already in finalization phase, as the order of finalizers is not
  guaranteed.  rb_mutex_t should be used in place of Mutex object
  in the future.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:05 +00:00
yugui
3923e587f3 merges r29413 from trunk into ruby_1_9_2.
--
* vm_core.h: add missing prototypes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:06:00 +00:00
yugui
cd28b651db merges r29410 from trunk into ruby_1_9_2.
--
* parse.y (regexp): dregexp has literal string only at the head
  and successors are array.  [ruby-core:32682]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 08:05:54 +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