Commit graph

3020 commits

Author SHA1 Message Date
yugui
a474c66f46 merges r30657 from trunk into ruby_1_9_2.
--
	* vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
	  variable from GC. [Bug #4322] [ruby-dev:43108]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-18 10:43:34 +00:00
yugui
25394cb929 merges r30654 from trunk into ruby_1_9_2.
--
* string.c (=~): documentation fix; the return value is nil when
  it doesn't match. patched by Andrei Kulakov [ruby-core:34562]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:56 +00:00
yugui
32fdf95a32 merges r30652 from trunk into ruby_1_9_2.
--
* string.c (rb_str_resize): get rid of out-of-bound access.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:49 +00:00
yugui
ce02662c0b merges r30648 from trunk into ruby_1_9_2.
--
* string.c (rb_string_value_cstr): rb_str_modify can change
  RSTRING_PTR.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:44 +00:00
yugui
22955e9b4d merges r30647,r30650 and r30651 from trunk into ruby_1_9_2.
--
	* test/ruby/test_thread.rb: Added various ConditionVariable tests.
--
* test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get rid of method redefined.
--
* test/ruby/test_thread.rb: remove unused variables.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:38 +00:00
yugui
be007d6eae merges r30641 from trunk into ruby_1_9_2.
--
* error.c (rb_invalid_str): prevent intermediate variable from GC.
  [ruby-core:34820]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:35 +00:00
yugui
4676e643aa merges r30628 from trunk into ruby_1_9_2.
--
* ext/psych/parser.c (parse): fixing off-by-one error on line numbers
  in parse exceptions.  [ruby-core:34690]
* test/psych/test_parser.rb: test for error

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:31 +00:00
yugui
a0e5aea08a merges r30601 from trunk into ruby_1_9_2.
--
    * proc.c (proc_call): Add gc guard to avoid segfault. The fix
      is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:26 +00:00
yugui
ac525f596c merges r30597 from trunk into ruby_1_9_2.
--
* parse.y: avoid NULL reference.  [ruby-dev:43067]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:22 +00:00
yugui
aeb3ba1e58 merges r30595 from trunk into ruby_1_9_2.
--
* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
  no bytes are written to the buf. [ruby-dev:43062]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30688 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:18 +00:00
yugui
baac6078e3 merges r30587 from trunk into ruby_1_9_2.
--
* ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON
  strings should be dumped with double quotes. [ruby-core:34186]
* test/psych/test_json_tree.rb: test for double quotes

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-28 02:25:14 +00:00
yugui
a152da5fcd merges a part of revision 5917 in MiniTest's repository into ruby_1_9_2.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-27 14:24:40 +00:00
yugui
b4eba9bba0 merges revision 6057 in MiniTest's repository into ruby_1_9_2.
--
+ Exit autorun via nested at_exit handler, in case other libs call

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-27 14:24:33 +00:00
yugui
2de2b2ab2f merges a half of revision 5937 and 5939 in MiniTest's repository into ruby_1_9_2.
--
- Fixed some of the assertion default messages

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-27 14:24:24 +00:00
yugui
fb7988402f merges a half of revision 5875 in MiniTest's repository into ruby_1_9_2. It corresponds to
r29259 on Ruby's trunk.
--
assert_raises now lets MiniTest::Skip through. (shyouhei)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-27 14:24:11 +00:00
yugui
03b3446556 * too/rbinstall.rb (install?(:ext, :comm, :gem)): no longer
installs no-versioned gempsecs. [ruby-core:34011]
  Patch by Luis Lavena.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 13:18:57 +00:00
yugui
97ee61ab88 merges r30551 from trunk into ruby_1_9_2.
--
* test/net/smtp/test_ssl_socket.rb: fix dependency.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:45 +00:00
yugui
457a6fda26 merges r30544 from trunk into ruby_1_9_2.
--
* test/net/imap/test_imap.rb: call neither logout nor disconnect
  unless connected.  patch by Kazuhiro NISHIYAMA.  [ruby-dev:42860]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:39 +00:00
yugui
8de1ee21e4 merges r30543 from trunk into ruby_1_9_2.
--
* lib/net/imap.rb: use bytesize for binary strings.
  patched by Yoshimasa Niwa. [ruby-core:34222]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:36 +00:00
yugui
c303d3838b merges r30540 and r30541 from trunk into ruby_1_9_2.
--
* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
  gzip's header is the size of uncompressed input data modulo 2^32.
  [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
--
The cast must use uint32_t. [ruby-core:34481]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:32 +00:00
yugui
849e45dee8 merges r30536 from trunk into ruby_1_9_2.
--
* io.c (argf_next_argv): go advance when the next file cannot be
  read.  [ruby-core:34446]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:27 +00:00
yugui
161fde4a43 merges r30525 from trunk into ruby_1_9_2.
--
	* io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
	  long type arguments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:22 +00:00
yugui
54d8811ce6 merges r30526 and r30527 from trunk into ruby_1_9_2.
--
	* io.c (rb_f_syscall): Some syscall return unsigned or pointer value.
	  Therefore we should only check the result is -1 or not. [ruby-core:34062]
--
	* io.c (rb_f_syscall): Add warning messages. [ruby-core:34062]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:15 +00:00
yugui
62941003a2 merges r30520 from trunk into ruby_1_9_2.
--
* lib/net/http.rb (Net::HTTP#connect): makes it timeout during
  SSL handshake too. [ruby-core:34203]
  Patch by Marc Slemko.

* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_timeout_during_HTTP_session):
  test for [ruby-core:34203]

* test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
  ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:11 +00:00
yugui
829779e20c merges r30499 from trunk into ruby_1_9_2.
--
* io.c (Kernel.#syscall): implemented on LP64/LLP64 environments too.
  also uses __syscall if available for *BSD on 64bit architecture.
  [ruby-core:34062]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:08 +00:00
yugui
9c2c4f5021 merges r30496 and r30519 from trunk into ruby_1_9_2.
--
* ext/readline/readline.c: apply a patch from Nobuyoshi Nakada.
  fixed #3616 [ruby-core:31484] IRB + readline incorrectly counts
  non-printing characters in prompt
--
* ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE
  and RL_PROMPT_END_IGNORE. [ruby-core:34331]

* ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
  RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
  error with libedit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:04 +00:00
yugui
357bdaebde merges r30484 from trunk into ruby_1_9_2.
--
* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
  regexp after open bracket.  [ruby-core:34183]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:35:01 +00:00
yugui
52f4167206 merges r30483 from trunk into ruby_1_9_2.
--
* bignum.c (bigmul1_karatsuba): avoid overflow that make assertion
  fail in certain case.  this patch is contributed from Ray Chason
  <chasonr at gmail.com> in personal communication.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-01-16 12:34:57 +00:00
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