Commit graph

24190 commits

Author SHA1 Message Date
ktsj
85ead55c91 * backport r33177 from trunk.
* test/ruby/test_fiber.rb (TestFiber#test_no_valid_cfp):
  add a test. Unlike TestThread#test_no_valid_cfp,
  this test succeeds even if win32ole is required (see r33153).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-03 16:02:22 +00:00
nobu
8e1b2f660c * test/ruby/test_encoding.rb (test_find): mingw is not Unix, of course.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-03 04:49:43 +00:00
svn
69c3434c0c * 2011-09-03
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-02 21:23:29 +00:00
nobu
012ddb6de7 * win32/win32.c (rb_w32_fd_copy): cast explicitly to suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-02 21:23:22 +00:00
nobu
8403b23f36 * io.c (validate_enc_binmode, prep_stdio): default to text mode on
dosish platforms.  [ruby-core:38822] [Bug #5164]
* transcode.c (rb_econv_prepare_options): keep default ecflags
  unchanged if no options.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-02 12:11:17 +00:00
nobu
c526a584c8 * vm_insnhelper.c (vm_search_const_defined_class): search
ancestors only when global scope.  [ruby-core:39227] [Bug #5264]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-02 05:36:49 +00:00
svn
f56f03b750 * 2011-09-02
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-02 00:58:17 +00:00
nobu
fcc41855e7 * parse.y (parser_tokadd_string, parser_yylex): ignore a backslash
which prefixes an non-ascii character, which has no escape
  syntax.  [ruby-core:39222] [Ruby 1.9 - Bug #5262]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-02 00:58:10 +00:00
nobu
0f0db4163d * insns.def (defineclass), vm_insnhelper.c (vm_get_cvar_base): see
also inherited constants for classes without superclass and
  modules.  [ruby-core:37698] [Bug #3423]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-01 08:31:24 +00:00
nobu
00e2e03962 properties.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-01 08:16:29 +00:00
usa
e0cde13a3c backported r33153 from trunk.
* test/ruby/test_thread.rb (TestThread#test_no_valid_cfp): skip when
  win32ole is required.  in such case, win32ole redefines
  Thread#initialize, and the block argument becomes to be not the top
  of the thread, then this testcase always fails.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-01 05:12:02 +00:00
naruse
b40ff978ee merge revision(s) 33148:
------------------------------------------------------------------------
r33148 | naruse | 2011-09-01 09:23:20 +0900 (Thu, 01 Sep 2011) | 1 line

Remove tests of json/add/{complex, rational}.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-01 00:25:52 +00:00
naruse
c9de257866 merge revision(s) 33142:
* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-31 07:02:52 +00:00
marcandre
cc6407f8fe * backport r33140 from trunk
* numeric.c (flo_round): Avoid overflow by optimizing for trivial cases
  [Bug #5227]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-31 04:20:53 +00:00
kosaki
59c3230ff6 * configure.in: fix r32835. $withval can't be used outer AC_ARG_WITH().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 21:48:54 +00:00
kosaki
458ef71dbf merge revision(s) 33133:
* win32/win32.c (rb_w32_select_with_thread): and my typo. we all must
	  be more careful.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 20:29:08 +00:00
kosaki
e733edd76b merge revision(s) 33132:
* thread.c (rb_thread_select): critical typo in r33117.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 20:28:50 +00:00
kosaki
c45ad62966 merge revision(s) 33131:
* test/-ext-/old_thread_select/test_old_thread_select.rb
	  (TestOldThreadSelect#test_old_select_read_timeout): if the machine
	  is fast enough, the time used by code around IO.select may be smaller
	  than Time implement threshold.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 20:28:31 +00:00
kosaki
c8473b46ae merge revision(s) 33130:
* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
	  typo.

	* test/-ext-/old_thread_select/test_old_thread_select.rb
	  (TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
	  of SIGUSR1 because the former is general and the latter is platform
	  dependent.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 20:28:10 +00:00
kosaki
b1ab5d1b42 merge revision(s) 33128:
* win32/win32.c, include/ruby/intern.h (rb_w32_fd_copy): implement
	  for rb_thread_select() in thread.c.  the use of rb_fd_copy() is
	  introduced in r33117.
	  [Bug #5229] [ruby-core:39102]

	* thread.c (rb_thread_select): must call rb_fd_init() before using
	  rb_fdset_t.  see the implementations of rb_fd_init()s if you want to
	  know the reason.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 20:27:21 +00:00
naruse
ee56dd160e merge revision(s) 33124:
------------------------------------------------------------------------
r33124 | naruse | 2011-08-30 14:21:27 +0900 (Tue, 30 Aug 2011) | 1 line

Don't include complex and rational; fix r33122.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 05:22:00 +00:00
naruse
510f6dc7d0 merge revision(s) 33122:
* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).
	  [Bug #5173] [ruby-core:38866]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 02:25:32 +00:00
kosaki
f363d4d8c1 merge revision(s) 33118:
* cont.c (fiber_entry): fix stack allocation failure on Debian
	  GNU/kFreeBSD.
	  Patch by Lucas Nussbaum <lucas at lucas-nussbaum dot net>.
	  [Bug #5241] [ruby-core:39147]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 00:54:09 +00:00
kosaki
4e9438bc91 * backport r33117 from trunk.
* thread.c (rb_thread_select): rewrite by using
  rb_thread_fd_select(). old one is EINTR unsafe.
  Patch by Eric Wong. [Bug #5229] [ruby-core:39102]

* test/-ext-/old_thread_select/test_old_thread_select.rb:
  a testcase for rb_thread_select().
* ext/-test-/old_thread_select/old_thread_select.c: ditto.
* ext/-test-/old_thread_select/depend: ditto.
* ext/-test-/old_thread_select/extconf.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 00:53:44 +00:00
kosaki
f1c8cdd12b merge revision(s) 33114:
* configure.in: fix a build failure on GNU Hurd.
	  Patch by Samuel Thibault <sthibault at debian dot org>. Thank you!
	  [Bug #5250] [ruby-core:39185]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 00:16:26 +00:00
nagachika
a3e598f414 * backport r33106 from trunk.
* ext/date/date_parse.c (date_zone_to_diff): keep a temporary string
  stored in variable while the contents buffer is beeing used.

* ext/date/date_parse.c (date_zone_to_diff): get rid of out of bounds
  memory read. [ruby-dev:44409] [Bug #5213]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-28 06:58:06 +00:00
svn
287d083bab * 2011-08-28
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-27 20:37:09 +00:00
ryan
344849694a backported 33102 from trunk
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-27 20:37:05 +00:00
ktsj
ee760a5d66 * ChangeLog: style fix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-27 12:21:44 +00:00
ktsj
e57aecbadd * vm.c (rb_vm_rewrite_dfp_in_errinfo): change return type
to suppress a warning.

* vm_core.h: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-27 12:02:00 +00:00
ktsj
3bffb317d6 * backport r33096 from trunk.
* proc.c (proc_new): force to rewrite errinfo when calling Proc.new in ensure.
  [Bug #5234] [ruby-core:39125]

* vm.c (rb_vm_rewrite_dfp_in_errinfo): new function.

* vm.c (vm_make_env_each): changed accordingly.

* vm_core.h: ditto.

* bootstraptest/test_flow.rb: add tests for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-27 10:14:29 +00:00
drbrain
9754ed4885 * NEWS: Update version of rake to 0.9.2.2.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 23:59:34 +00:00
drbrain
33839f6711 * backport r33087 from trunk
* lib/rdoc:  Import RDoc 3.9.4.  Typo and grammar fixes by Luke Gruber.
  [Ruby 1.9 - Bug #5203]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 23:58:26 +00:00
drbrain
8b2a8e2b45 * backport r33087 from trunk.
* lib/open-uri.rb:  Fix indentation of OpenURI::OpenRead#open.  Use ++
  instead of `' for method arguments in open-uri.rb


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 23:55:45 +00:00
drbrain
aed384f343 * backport r33086 from trunk.
* ext/pathname/lib/pathname.rb:  Fix typos and grammar mistakes.  Patch
  by Luke Gruber.  [#5203]
* ext/pty/lib/expect.rb:  ditto
* lib/mathn.rb:  ditto
* lib/net/http.rb:  ditto
* lib/open-uri.rb:  ditto
* lib/ostruct.rb:  ditto
* lib/tempfile.rb:  ditto
* lib/thread.rb:  ditto
* lib/weakref.rb:  ditto
* sample/webrick/httpproxy.rb:  ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 23:54:49 +00:00
svn
74a8074e4c * 2011-08-27
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 21:50:55 +00:00
ryan
f9835b4697 merged 33082-33083 from trunk
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 21:50:50 +00:00
drbrain
405acb0cdc * Update RubyGems version in NEWS
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 02:35:21 +00:00
svn
0073c5374c * 2011-08-26
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 01:13:01 +00:00
drbrain
f5c8aecebc * backport r33074 from trunk
* lib/rubygems:  Update to RubyGems 1.8.10.  Fixes security issue in
  creating ruby-format gemspecs.  Fixes Gem.dir not being at the front
  of Gem.path to fix uninstall and cleanup commands.  Fixes gem
  uninstall stopping on the first missing gem.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-26 01:12:57 +00:00
nobu
322937ff00 properties.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-25 13:18:11 +00:00
sorah
ceb94d9888 * backport r33045 from trunk.
* insns.def (defined): fix to checking class variable.
  A patch by Magnus Holm <judofyr@gmail.com>.  Thanks!

* test/ruby/test_variable.rb: add a test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-25 04:13:53 +00:00
drbrain
f30e113b1d * backport r33066 from trunk.
* ext/openssl/lib/openssl/bn.rb:  Hide copyright info from RDoc.
* ext/openssl/lib/openssl/digest.rb:  ditto
* ext/openssl/lib/openssl/cipher.rb:  ditto

* backport r33065 from trunk.

* ext/openssl/ossl_digest.c:  Document OpenSSL::Digest::digest and add
  an example to OpenSSL::Digest.  Patch by Sylvain Daubert.
  [Ruby 1.9 - Bug #5166]
* ext/openssl/lib/openssl/digest.rb (module OpenSSL):  ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-25 00:52:10 +00:00
ko1
382ed4285a * vm.c (vm_make_env_each): work around to solve Bug #2729.
fixes: Bug #2729
  a patch from Kazuki Tsujimoto <kazuki@callcc.net>
  This problem is caused by changing dfp (dynamic env pointer)
  from saved dfp.  Saved dfp is pointed env in VM stack.  However,
  the dfp can be moved because VM copies env from VM stack to
  the heap.  At this copying, dfp was also changed.  To solve this
  problem, I'll try to change throw mechanism (not save target dfp,
  but save target cfp).
* bootstraptest/test_flow.rb: add a test for above.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-24 23:27:35 +00:00
marcandre
7a3f54edb1 * backport r33060, 33061 from trunk
* numeric.c (int_round): Fix Integer#round [ruby-core:39096]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-24 23:04:50 +00:00
tenderlove
0a50e17e53 * ext/psych/lib/psych.rb: Fixing psych version number.
* ext/psych/psych.gemspec: updating the gemspec.


Conflicts:

	ext/psych/psych.gemspec

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-24 21:56:19 +00:00
svn
4a11e85742 * 2011-08-25
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-24 21:18:47 +00:00
tenderlove
497e61ccba * ext/psych/lib/psych/nodes/node.rb: default to_yaml encoding to be
UTF-8.
* test/psych/test_encoding.rb: test yaml dump encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-24 21:18:44 +00:00
naruse
bad0b9d807 merge revision(s) 33047:
------------------------------------------------------------------------
r33047 | naruse | 2011-08-24 16:28:12 +0900 (Wed, 24 Aug 2011) | 1 line

Add a missing parenthesis in the example.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-24 07:29:33 +00:00
drbrain
6b8fe957ed * backport r33043 from trunk.
* lib/rdoc:  Update to RDoc 3.9.3.  Fixes RDoc with `ruby -Ku`.  Allows
  HTTPS image paths to be turned into <img> tags.  Prevents special
  markup inside <tt> from being processed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-24 00:02:17 +00:00