Commit graph

20123 commits

Author SHA1 Message Date
nobu
e7ad51a53a * lib/un.rb (setup): fix of word splitting. [ruby-dev:41723]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 20:49:37 +00:00
yugui
5ee6b28538 merges r28327,r28329 and r28332 from trunk into ruby_1_9_2.
--
* ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
--
* ext/fiddle/extconf.rb: De Morgan's laws.
--
* ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
  On Debian/lenny, which is a "supported" platform, ffi.h is installed
  in /usr/include/i486-linux-gnu/.  This causes build error when using
  gcc whose target is not i486-linux-gnu.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 02:00:46 +00:00
yugui
9694e07f55 merges r28330 from trunk into ruby_1_9_2.
--
* test/ruby/test_io.rb (safe_4): does not use Timeout because
  Timeout.timeout uses Thread#kill which raises SecurityError when
  $SAFE == 4.  based on a patch from Tomoyuki Chikanaga.
  [ruby-dev:41484]

* test/ruby/test_io.rb (test_print_separators): use pipe (test helper
  method) instead of IO.pipe.  [ruby-dev:41484]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 02:00:15 +00:00
yugui
55f1a19451 merges r28315 from trunk into ruby_1_9_2.
--
* ext/fiddle/closure.c (dealloc): refix workaround r28300.
  don't use ffi_closure_alloc, ffi_prep_closure_loc and
  ffi_closure_free on MACOSX and __linux__.
  [ruby-dev:41483] [ruby-dev:41214]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 01:59:38 +00:00
yugui
fac216efa0 merges r28312 from trunk into ruby_1_9_2.
--
* test/ruby/test_rubyoptions.rb: add a simple test for __END__ and
  DATA.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 01:59:18 +00:00
yugui
cacecbfc99 merges r28297 from trunk into ruby_1_9_2.
--
* test/ruby/test_method.rb (test_public_methods_with_extended): test for [ruby-dev:41553].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 01:58:56 +00:00
yugui
d37247c79c merges r28280 from trunk into ruby_1_9_2.
--
* include/ruby/missing.h (isnan): fix compilation error on OpenBSD.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 01:58:12 +00:00
nobu
6fa8e6d6e9 * marshal.c (struct dump_arg, struct load_arg): merge taint and
untrust flags into infection as bit flags.

* marshal.c (w_nbyte, clear_dump_arg): infect the buffer as soon
  as appending, because it might have been finalized already at
  exit.  based on a patch by Tomoyuki Chikanaga
  at [ruby-dev:41672].  [Bug #3463]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-23 20:44:44 +00:00
nobu
8ab2fec2a8 * ext/pty: moved documents and samples to the appropriate places.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-23 08:25:12 +00:00
nobu
01b7690de7 * NEWS (ptr): new method and deprecated methods. [ruby-dev:41681]
* ext/pty/{README,README.ja}: ditto.

* ext/pty/pty.c (pty_check): add rdoc.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-23 08:12:54 +00:00
nobu
b053b97809 * test/ruby/test_regexp.rb (test_dup_warn): read in UTF-8
encoding regardless environment.

* test/ruby/envutil.rb (invoke_ruby): add encoding option.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-23 03:44:55 +00:00
akr
b05d8841fc * time.c (num_exact): fix for mathn. [ruby-dev:41599]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-22 14:13:09 +00:00
akr
096dccd7ff * ext/socket/lib/socket.rb: suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-22 13:41:16 +00:00
marcandre
137e060b86 merge from trunk (28382)
* lib/fileutils.rb: Fix warning

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-22 06:07:46 +00:00
marcandre
57502a5e57 merge from trunk (28381)
* io.c: rdoc fix for ARGF.lineno; see [ruby-core:29048]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-22 06:06:34 +00:00
marcandre
334f3dd5ce merge from trunk (r28379)
* class.c: rdoc fix [ruby-core:30449]

* object.c: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-22 04:56:37 +00:00
marcandre
b76c33fead Backport of r28376:
* lib/delegate.rb: Forward #trust, #untrust, #taint and #untaint
  to both the delegator and __getobj__ [ruby-core:26138]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-22 04:29:59 +00:00
tarui
0418aab850 merge from trunk (r28316)
* lib/drb/drb.rb: raise DRbConnError instead of ArgumentError if too
	  many arguments. [ruby-dev:41481]

	* test/drb/test_drb.rb: ditto.

	* test/drb/drbtest.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-21 17:02:29 +00:00
tarui
b808fcae8f merge from trunk (r28354)
* lib/webrick/httpservlet/filehandler.rb
	  (prevent_directory_traversal): apply filesystem encoding to path
	  only during calling File.expand_path.  [ruby-dev:41423]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-21 16:34:42 +00:00
svn
79aa744a5e * 2010-06-22
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-21 15:14:30 +00:00
wanabe
71fecd39f8 backport r28368:
* eval_error.c (error_print): clear raised_flag while error-printing
  to avoid hang. [ruby-core:27608]

* test/ruby/test_beginendblock.rb (test_endblock_raise): add test for
  above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-21 15:14:21 +00:00
yugui
a7a26fe56b * Makefile.in (distclean-ext): removes directories for extensions
correctly.

* common.mk (realclean-local): removes id.h too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-18 14:10:33 +00:00
yugui
9f9dad2cca * enc/Makefile.in (realclean): has been missing. necessary
for make realclean-enc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-17 16:35:06 +00:00
svn
7ee351aa26 * 2010-06-18
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-17 16:16:38 +00:00
yugui
9665094eb6 * configure.in (RMDIRS): reverts r27011 because it causes bothersome
messages on make clean.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-17 16:16:24 +00:00
usa
e557b8821b merge from trunk (r28349)
* file.c (rb_str_encode_ospath): when the encoding of the parameter
  is ASCII-8BIT, should recognize as filesystem encoding, and convert
  to UTF-8 on Windows.

* file.c (realpath_rec): should convert to ospath encoding before
  calling lstat().

* file.c (rb_realpath_internal): resolved string should take over
  the encoding of base string.

* transcode.c (rb_str_encode): should return new string always.
  fixed #3444.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-17 09:55:46 +00:00
mrkn
6fefc895ca * ext/digest/sha2/lib/sha2.rb: revert r28347. It's my mistake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-17 09:24:35 +00:00
mrkn
c07c5e1e9f * ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so", for the filename extension part of native libraries.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-17 08:39:41 +00:00
svn
6e8c346abc * 2010-06-17
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-17 08:39:34 +00:00
mrkn
2f2da243e9 * ext/digest/sha2/extconf.rb: remove a check for uint64_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-17 08:39:22 +00:00
knu
5a55408b77 * ext/digest: Work around a build problem with VC++ 2010, likely
due to a bug of its cl.exe. [Bug #3231]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-16 09:38:14 +00:00
svn
465ce57d42 * 2010-06-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-16 06:45:39 +00:00
usa
b2161ffac1 merge from trunk (r28333)
* error.c (rb_bug): existance of _set_abort_behavior() depends on
  runtime version, not compiler version.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-16 06:45:28 +00:00
svn
9e38ffc3f5 * 2010-06-14
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-14 13:46:16 +00:00
akr
b7fe55b319 * test/socket/test_socket.rb (test_udp_server): rescue Errno::ENOSYS
for Windows.

* test/socket/test_nonblock.rb (test_sendmsg_nonblock_error): ditto.

  [ruby-dev:41597] reported by Masaya Tarui.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-14 13:46:06 +00:00
marcandre
4e968660ee Backport revision 28309:
* lib/delegate.rb: Delegate !=, eql? and hash [ruby-core:26139]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-12 19:28:54 +00:00
naruse
1b5c41b460 merge revision(s) 28307:
* enc/trans/utf8_mac.trans (buf_apply): fix for patterns
	  whose result is 2 bytes. [ruby-core:30751]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-12 17:18:01 +00:00
naruse
b27ec368b3 merge revision(s) 28305:
* time.c (rb_localtime_r2): fix mixed declarations and code.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-12 16:41:04 +00:00
naruse
03efb12af2 merge revision(s) 28302:
* ext/dl/lib/dl.rb: don't require when already loaded.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-12 16:37:49 +00:00
naruse
6fcf972c20 merge revision(s) 28300:
* ext/fiddle/closure.c (dealloc): workaround fix for libffi's
	  ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-12 16:37:21 +00:00
tarui
c09d54a46c * test/open-uri/test_open-uri.rb (test_progress, test_progress_chunked):
fix typo.
	


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 21:47:41 +00:00
svn
5815bb4471 * 2010-06-12
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 21:34:51 +00:00
tarui
c7c14d4157 * test/open-uri/test_open-uri.rb (test_progress, test_progress_chunked):
'size' is a accumulated transferred size in bytes.
	


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 21:34:44 +00:00
akr
8ce47e7a26 * time.c (init_leap_second_info): check the result of
gmtime_with_leapsecond.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 14:26:57 +00:00
mame
a260025a02 merges r28279 from trunk into ruby_1_9_2.
---

* lib/rubygems/install_update_options.rb
  (Gem::InstallUpdateOptions#add_install_update_options): deprecate
  --test option which has not worked.  [ruby-core:21714]

* test/rubygems/test_gem_command_manager.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 14:02:18 +00:00
mame
87a9a15044 * README: add a note about linking a library whose license is not
compatible with Ruby License.  [ruby-core:30662]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 13:38:18 +00:00
yugui
27a0ad31c4 merges r28187 and r28189 from trunk into ruby_1_9_2.
--
* array.c (rb_ary_product): clear uninitialized elements in temporary
  array.
--
* test/ruby/test_array.rb (test_product): test for r28187.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 04:21:18 +00:00
yugui
24d86dc09d merges r28174 from trunk into ruby_1_9_2.
--
add an assertion message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 04:21:12 +00:00
yugui
33e861ba39 merges r28158 from trunk into ruby_1_9_2.
--
Clarification of what '*' matches.  Patch by John Wells <john.wells at greatworx.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 04:21:07 +00:00
yugui
234358faf8 merges r28157 from trunk into ruby_1_9_2.
--
* test/dl/test_cfunc.rb: test for r28156

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-11 04:21:01 +00:00