Commit graph

3434 commits

Author SHA1 Message Date
usa
25f531a924 merge revision(s) 33691,33692
* io.c (rb_update_max_fd): fstat(2) can fail with other than
  EBADF.  [ruby-dev:44837] [Bug #5593].  Cf.
  http://pubs.opengroup.org/onlinepubs/9699919799/functions/fstat.html

[Backport #5593]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-06 07:37:33 +00:00
usa
a3fcbc9712 merge revision(s) 33667:
* io.c (io_fwrite): call rb_w32_write_console() only if FMODE_TTY is
  set.  this is the one of the reason of IO writing slowness of Windows
  in 1.9.3 or later.

[Backport #5592]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-06 07:32:09 +00:00
usa
3f8c4ba70f merge revision(s) 33603:
* file.c (file_expand_path): reset coderange after expanding path.

[Backport #5601] [Backport #5629]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-06 07:25:37 +00:00
naruse
63da304fb7 merge revision(s) 34306:
* ext/json/parser/parser.rl (json_string_unescape): workaround fix
	  for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888]
	  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-05 15:06:50 +00:00
naruse
e892c81cb1 merge revision(s) 34040,34051,34063,34389,34402,34403:
------------------------------------------------------------------------
r34040 | naruse | 2011-12-14 14:42:34 +0900 (Wed, 14 Dec 2011) | 1 line

Use pipe instead of $stdin.read.
------------------------------------------------------------------------

	* test/ruby/envutil.rb (invoke_ruby): remove :timeout option before
	  pass it to Kernel#spawn.

	* test/ruby/test_thread.rb
	  (TestThreadGroup#test_thread_timer_and_interrupt): skip exit status
	  assertion because we cannot get signal status on Windows.

	* win32/win32.c (CreateChild): create process group to receive the
	  signal by GenerateConsoleCtrlEvent().

	* win32/win32.c (kill): use CTRL_BREAK_EVENT instead of CTRL_C_EVENT
	  if a process group is specified. CTRL_C_EVENT signal cannot be
	  generated for process groups for the specification.
	  [ruby-dev:45149] [Bug #5812]

	* test/ruby/envutil.rb (EnvUtil.invoke_ruby): yield also child pid
	  in block form.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-03 07:17:03 +00:00
naruse
5dc6d20cc3 merge revision(s) r34038,34099:
* thread_pthread.c (ubf_select): call rb_thread_wakeup_timer_thread()
	  only when it is not timer_thread. [Bug #5757] [ruby-dev:44985]
	  patched by Tomoyuki Chikanaga.

	* thread_pthread.c (ping_signal_thread_list): remove return value.

	* thread_pthread.c (check_signal_thread_list): add a new function to
	  check if signal thread list is empty.

	* thread_pthread.c (thread_timer): check signal thread list after
	  timer_thread_function(). main thread might be added into signal thread
	  list during timer_thread_function().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-03 01:11:37 +00:00
svn
ea6101f8dd * 2012-02-01
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-31 19:10:20 +00:00
tenderlove
746e61e910 merging r34364 from trunk to ruby_1_9_3
--
* lib/uri/common.rb (URI.encode_www_form_component): initialize on
  requiring to support JRuby, which runs parallel multithreads.
  [ruby-core:42222] [Bug #5925]

* lib/uri/common.rb (URI.decode_www_form_component): initialize on

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-31 19:10:15 +00:00
svn
a16b7828f8 * 2012-01-28
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-27 20:53:45 +00:00
naruse
3c0ebab6f1 merge revision(s) r34350:
* encoding.c (rb_enc_compatible): fix segv on symbols.
	  [ruby-core:42204] [Bug #5921]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-23 09:19:10 +00:00
svn
6c02761849 * 2012-01-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-20 08:27:30 +00:00
svn
1e4420aefe * 2012-01-17
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-17 08:10:04 +00:00
svn
47c0124ed9 * 2012-01-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-16 07:42:13 +00:00
ayumin
abe4ff9225 merge revision(s) 33790:
* time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too.
	  patch by Tomoyuki Chikanaga.
	  [ruby-dev:44827] [Bug #5586]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-13 06:22:56 +00:00
kosaki
edfc3526a7 merge revision(s) 34278:
* cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
	  reserving a memory space with ALLOCA_N for restoring machine stack
	  stored in cont->machine_stack, but clang optimized out it (and
	  maybe #5851 is also caused by this).
	  This affected TestContinuation#test_check_localvars.

	* cont.c (cont_restore_1): revert workaround introduced in r32201.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-12 19:07:09 +00:00
svn
6fe410d426 * 2012-01-13
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-12 16:46:19 +00:00
ayumin
f22910b68a merge revision(s) 34253:
* test/ruby/test_io.rb (test_autoclose_true_closed_by_finalizer,
	  test_autoclose_true_closed_by_finalizer): skip if IO objects are
	  not recycled yet. [ruby-dev:45098] [Bug #5850]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-11 16:42:25 +00:00
ayumin
095ebf1dfa merge revision(s) 34252:
* lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even
	  when exception is raised at @tempfile.close. [ruby-dev:45113]

	* lib/tempfile.rb (Tempfile#unlink): fix a typo.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-11 16:41:54 +00:00
ayumin
33341205e7 merge revision(s) 34250:
* gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
	  an exception under rb_protect(). [ruby-dev:45113]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-11 16:41:21 +00:00
ayumin
3b22a82547 merge revision(s) 34129:
* test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't
	  accept the block argument.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-11 16:40:59 +00:00
svn
c511d463d8 * 2012-01-10
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-10 07:13:10 +00:00
ayumin
6166e9cf28 merge revision(s) 34204:
* lib/rexml/parsers/baseparser.rb: use private instead of _xxx
	  method name. This is Ruby code not Python code.
	  refs #5696


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-07 13:47:25 +00:00
ayumin
68fff3881d merge revision(s) 34202:
* lib/rexml/parsers/baseparser.rb: rexml BaseParser uses
	  instance_eval unnecessarily on listener add.
	  patch from Charles Nutter. [Bug #5696] [ruby-core:41437]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-07 13:40:21 +00:00
svn
94443cf523 * 2012-01-04
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-04 04:54:01 +00:00
kosaki
0b18cf7ff6 fix up r34199
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34206 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-04 04:53:57 +00:00
ayumin
a48e727f85 merge revision(s) 33343:
* test/rexml/test_sax.rb: add require rexml/document.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 10:16:53 +00:00
kosaki
0239882c81 merge revision(s) 34108:
* ext/readline/readline.c (Init_readline): libedit check
	  rl_getc_function only when rl_initialize() is called, and
	  using_history() call rl_initialize(). This assignment should be
	  placed before using_history(). [ruby-core:40641] [Bug #5539]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 04:54:20 +00:00
kosaki
379a35b870 merge revision(s) 33566:
* tool/rbinstall.rb (install_recursive, bin-comm): split mere
	  string not path name.  [ruby-core:40462] [Bug #5492]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 04:48:34 +00:00
kosaki
d838b0d043 merge revision(s) 33556:
* win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010.
	  [Bug #5243]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 04:42:33 +00:00
kosaki
0b217230ea merge revision(s) 34190:
* tool/merger.rb (#version_up): version.h date should be Japanese
	  locale date.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 02:41:20 +00:00
kosaki
bade2a2d38 merge revision(s) 33577:
* configure.in: check -fno-omit-frame-pointer acceptance and usage
	  under MinGW. [ruby-core:39957] [Bug #5407]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 02:37:28 +00:00
svn
b3b5650307 * 2012-01-03
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 01:22:32 +00:00
kosaki
398a718d2e merge revision(s) 33472:
------------------------------------------------------------------------
r33472 | xibbar | 2011-10-17 13:33:57 -0400 (Mon, 17 Oct 2011) | 4 lines

Tue Oct 18 02:24:19 2011  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>

* lib/cgi/core.rb (QueryExtension#read_multiparat): replace 'stdinput'
  from '$stdin' because using fast cgi. [Bug #5451]
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 01:22:28 +00:00
svn
275e7841a6 * 2012-01-03
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 01:05:44 +00:00
kosaki
7444bbac6b merge revision(s) 33532:
* include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
	  patched by The Written Word Inc. [ruby-core:40422] [Bug #5489]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 01:05:41 +00:00
svn
b588fc2fed * 2012-01-03
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 01:00:28 +00:00
kosaki
6bdde0e5e6 merge revision(s) 33468:
* ext/pty/pty.c (pty_check): should return nil until the child
	  terminates or stops.  [ruby-dev:44600] [Bug #2642]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 01:00:23 +00:00
svn
9e736114eb * 2012-01-03
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 00:27:49 +00:00
kosaki
d0ad683bb2 merge revision(s) 33030:
* thread.c (update_coverage): skip coverage count up if the current
	  line is out of the way.  rb_sourceline() is unreliable when source
	  code is big.  [ruby-dev:44413]

	* test/coverage/test_coverage.rb: add a test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 00:27:45 +00:00
svn
60f63dc385 * 2012-01-03
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 00:09:26 +00:00
kosaki
8d82657abb merge revision(s) 33693:
* thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield().
	  [Bug #5130] [ruby-core:38647]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 00:09:21 +00:00
svn
27fd7ee4a8 * 2012-01-03
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-02 23:55:31 +00:00
kosaki
496e9a7bb0 merge revision(s) 33630:
* win32/configure.bat: disable delayed expansion of enironment variable.
	  [Bug #5517] [ruby-core:40531]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-02 23:55:25 +00:00
svn
cae12e5d25 * 2011-12-30
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-30 05:56:56 +00:00
svn
9a75b9198a * 2011-12-28
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-28 02:23:06 +00:00
svn
def733c556 * 2011-12-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-20 06:52:08 +00:00
svn
50761244b1 * 2011-12-15
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-15 01:45:05 +00:00
svn
046517c061 * 2011-12-14
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-14 06:28:39 +00:00
svn
f7a9b07cbe * 2011-12-13
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-12 17:47:36 +00:00
tenderlove
a7c2faebb0 merge revision(s) 33160,33381,33382,33383,33384,33385:
* ext/psych/lib/psych.rb: update psych version.
    * ext/psych/psych.gemspec: generate new gemspec for new version.

    * ext/psych/lib/psych.rb: calling `yaml` rather than `to_yaml`.
    * ext/psych/lib/psych/nodes/node.rb: Rename `to_yaml` to just `yaml`
      in order to avoid YAML::ENGINE switching from replacing this method.
    * test/psych/helper.rb: fix tests for method name change.
    * test/psych/test_document.rb: ditto
    * test/psych/visitors/test_emitter.rb: ditto

    * ext/psych/lib/psych/scalar_scanner.rb: Match values against the
      floating point spec defined in YAML to avoid erronious parses.
    * test/psych/test_numeric.rb: corresponding test.

    * ext/psych/lib/psych/visitors/to_ruby.rb: ToRuby visitor can be
      constructed with a ScalarScanner.
    * ext/psych/lib/psych/visitors/yaml_tree.rb: ScalarScanner can be
      passed to the YAMLTree visitor.

    * ext/psych/lib/psych/visitors/to_ruby.rb: Define Regexp::NOENCODING
      for 1.9.2 backwards compatibility.
    * ext/psych/lib/psych/visitors/yaml_tree.rb: Fix Date string
      generation for 1.9.2 backwards compatibility.

    * ext/psych/lib/psych/visitors/yaml_tree.rb: emit strings tagged as
      ascii-8bit as binary in YAML.
    * test/psych/test_string.rb: corresponding test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-12 17:47:29 +00:00