Commit graph

20151 commits

Author SHA1 Message Date
tarui
e31fb65d57 merge from trunk (r28408)
* ext/socket/raddrinfo.c: don't use __P.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-30 19:22:51 +00:00
nobu
870d031667 * test/ruby/test_rubyoptions.rb (test_script_from_stdin): by using
a pipe, get rid of not-well-defined behavior after the child
  process terminated in pty.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 22:29:12 +00:00
svn
cb20d4213d * 2010-06-30
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 17:32:33 +00:00
kanemoto
586720f311 * thread_pthread.c (get_stack): use pthread_getthrds_np() for AIX.
* configure.in: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 17:32:30 +00:00
yugui
921f484775 merges r28401 and r28402 from trunk into ruby_1_9_2.
--
* ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for
  getaddrinfo problem on Mac OS X Snow Leopard.  [ruby-core:29427]
  patch by Wataru Kimura.  [ruby-core:30842]
--
add a comment.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 14:48:32 +00:00
yugui
f895d9f594 merges r28395 and r28396 from trunk into ruby_1_9_2.
--
* configure.in (fchown): need to check.  [ruby-core:30818]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 14:48:26 +00:00
yugui
21d1a3207a merges r28387 from trunk into ruby_1_9_2.
--
* test/optparse/test_summary.rb: fixed superclass so that it run
  solely.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 14:48:17 +00:00
yugui
a90b1b574c merges r28361 from trunk into ruby_1_9_2.
--
* ext/psych/lib/psych/visitors/to_ruby.rb (resolve_klass): fix the
  exception message when attempting to load an unknown class.  Thanks
  nobu! [ruby-dev:41399]

* test/psych/test_psych.rb: test for the exception message

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 14:48:12 +00:00
yugui
55f779aaab merges r28357 from trunk into ruby_1_9_2.
--
* object.c: Object#public_methods, private_methods, etc. returns
  method ids that belong to the class or the singleton class(es) of
  the object.  [ruby-dev:41613]

* class.c: on the other hand, Module#public_instance_methods, etc.
  returns method ids that belong to the module itself (even if the
  module is singleton, it does not return method ids of super
  class(es); see [ruby-core:28837]).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 14:48:05 +00:00
tarui
ac8f4a4d38 merge from trunk (r28477)
* ext/stringio/stringio.c (strio_write): add RB_GC_GUARD.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 12:17:07 +00:00
usa
d5a784ae22 * file.c (rb_realpath_internal, realpath_rec): skip UNC share root
on DOSISH platforms.
  1272248179/600


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-29 05:41:23 +00:00
nagai
ea337d4b4c * ext/tk/lib/tk.rb: stop creating a dummy Tcl/Tk interpreter (fix
[ruby-core:30358]). And hide a root window before starting eventloop.
* ext/tk/extconf.rb: use tclConfig.sh/tkConfig.sh when frameworks
  are enabled on MacOS X.
* ext/tk/stubs.c: dirty hack for frameworks and stubs on MacOS X.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 21:44:06 +00:00
nobu
40d95eabb6 * ext/fiddle/fiddle.h: fixed typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 21:22:57 +00:00
tarui
6e8f7ef966 * test/rdoc/test_rdoc_rdoc.rb: change to bin-mode to write directly.
reported at http://rubyforge.org/tracker/index.php?func=detail&aid=28249&group_id=627&atid=2472
	* test/rdoc/test_rdoc_markup_pre_process.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 17:28:52 +00:00
tarui
6a05e8c566 merge from trunk (r28440)
* ext/dl/lib/dl/func.rb (call): don't overwrite original arguments
	  to defend from GC.

	* test/dl/test_func.rb (test_string): add test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 16:45:35 +00:00
tarui
7e80dc06b7 merge from trunk (r28423)
* include/ruby/ruby.h (static inline rb_gc_guarded_ptr): prevent
	  RB_GC_GUARD_PTR being removed by optimization.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 16:42:34 +00:00
tarui
4d97228014 merge from trunk (r28461)
* test/rubygems/gemutilities.rb: check ENV['make'] for make_command.
	* test/rubygems/test_gem_ext_configure_builder.rb: use gemutilities' make_command.
	* test/rubygems/test_gem_ext_ext_conf_builder.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 16:37:07 +00:00
svn
ac990e2dc8 * 2010-06-29
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 16:25:36 +00:00
tenderlove
ac3a9a62fe * ext/fiddle/fiddle.h: added FFI type detection to avoid bug in ffi
header files. Thanks Yugui! [ruby-core:30917]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 16:25:33 +00:00
akr
e3e94249a9 update doc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-28 13:05:07 +00:00
nobu
c6d1886def * marshal.c (w_object, r_bytes0, marshal_load): suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-27 15:13:25 +00:00
nobu
1f1937111d * include/ruby/io.h, io.c: reverted r21709.
* ruby.c (load_file_internal): nothing to read if EOF reached
  while reading shebang.  [ruby-core:30910]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-27 14:31:19 +00:00
akr
c69fda5e2a * io.c (simple_sendfile): don't try to send data more than SSIZE_MAX
with single sendfile call..
  based on the patch by Eric Wong.  [ruby-core:30908]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-27 04:30:31 +00:00
marcandre
7f7c68ebea merge r28448 from trunk into ruby_1_9_2:
* enum.c (zip): rdoc fix, patch by okkez [ruby-dev:41737]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-27 03:11:44 +00:00
nobu
e824b15653 * lib/rubygems/require_paths_builder.rb (write_require_paths_file_if_needed):
no reason that bin directory should be included in $LOAD_PATH.
  it is for executable files, but not libraries.  [ruby-core:25936]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-27 01:41:40 +00:00
nobu
0ca0a7cf12 * common.mk (clear-installed-list): put redirection before set
command, since it seems to be handled by nmake in special way.
  [ruby-dev:41711]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-26 02:56:41 +00:00
nobu
23e880c7bd * lib/un.rb (httpd): MaxClients also should be integer.
[ruby-dev:41724] [Bug #3477]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 21:25:03 +00:00
nobu
eb6731dcc1 * 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@28426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-24 21:15:33 +00:00
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