Commit graph

24190 commits

Author SHA1 Message Date
naruse
773b80bf36 merge revision(s) 33937: [Backport #5704]
* ext/zlib/zlib.c (rb_gzreader_initialize): use binary mode by default
	  under Windows. Patch by Hiroshi Shirosaki. [ruby-core:40706]
	  [Feature #5562]

	* include/ruby/encoding.h (void rb_econv_binmode): define NEWLINE
	  decorator.

	* io.c (rb_cloexec_fcntl_dupfd): Introduce NEED_READCONV and
	  NEED_WRITECONV to replace universal newline decorator by CRLF only
	  when required to improve file reading and writing under Windows.
	  Patch by Hiroshi Shirosaki. [ruby-core:40706] [Feature #5562]

	* io.c (do_writeconv): adjust binary mode if required.

	* io.c (read_all, appendline, swallow, rb_io_getline_1): ditto.

	* io.c (io_getc, rb_io_each_codepoint, rb_io_ungetc): ditto.

	* io.c (rb_io_binmode, rb_io_ascii8bit_binmode): ditto.

	* io.c (rb_io_extract_modeenc, rb_sysopen): ditto.

	* io.c (pipe_open, prep_stdio, io_encoding_set): ditto.

	* io.c (rb_io_s_pipe, copy_stream_body): ditto.

	* test/ruby/test_io_m17n.rb (EOT): add test for pipe and stdin in
	  binary mode.

	* win32/win32.c (init_stdhandle): remove O_BINARY from stdhandle
	  initialization.

	* win32/win32.c (rb_w32_write): use FTEXT mode accordingly.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 18:24:25 +00:00
naruse
093ade0eb8 merge revision(s) 33662,33666,33770: [Backport #5793]
------------------------------------------------------------------------
r33662 | usa | 2011-11-08 02:48:11 +0900 (Tue, 08 Nov 2011) | 18 lines

* include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK,
  ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro.

* io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv):
  set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO
  if the flag is available.

* io.c (make_writeconv): drop decorators for reading.

* io.c (make_readconv): drop decorators for writing.

* io.c (do_writeconv): existing writeconv is not the condition to raise
  ArgumentError.  should check textmode or not.

* test/ruby/test_io_m17n.rb
  (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above
  changes.

------------------------------------------------------------------------

	* include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK,
	  ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro.

	* io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv):
	  set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO
	  if the flag is available.

	* io.c (make_writeconv): drop decorators for reading.

	* io.c (make_readconv): drop decorators for writing.

	* io.c (do_writeconv): existing writeconv is not the condition to raise
	  ArgumentError.  should check textmode or not.

	* test/ruby/test_io_m17n.rb
	  (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above
	  changes.

	* io.c (argf_next_argv): wrong timing of setting ecflags.
	  fixed the failure of TestArgf#test_textmode introduced at r33662.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 18:21:01 +00:00
naruse
45501becfb merge revision(s) 33152,33649:
* test/ruby/test_io_m17n.rb (TestIO_M17N#test_{default_mode_on_dosish,
	  default_mode_on_unix,text_mode,binary_mode}): sorry for wrong test
	  committed in r33144.  I'd misunderstood the spec of ruby's universal
	  newline.

	* test/ruby/test_io_m17n.rb
	  (TestIO_M17N#test_default_stdout_stderr_mode): new test for
	  r33627-33629.  see [backport #5565]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 18:19:57 +00:00
naruse
3d3cf9705b merge revision(s) 33144:
* test/ruby/test_io_m17n.rb (TestIO_M17N#test_{default_mode_on_dosish,
	  default_mode_on_unix,text_mode,binary_mode}): tests for [Bug #5164].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 18:18:48 +00:00
naruse
04e65c3862 merge revision(s) 33200: [Backport #5794]
* transcode.c: enabled econv newline option.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 18:13:56 +00:00
naruse
84a867fae8 merge revision(s) 33935,33936,33987:
* variable.c (set_const_visibility): Module#private_constant has
	  changed the visibility of only the first argument.  Now it changes
	  all of them.  [ruby-list:48558]

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

	* variable.c (set_const_visibility): print a warning when no argument
	  is passwd to Module#private_constant.  [ruby-list:48558]

	* vm_method.c (set_method_visibility): ditto for
	  Module#private_class_method.

	* variable.c (set_const_visibility): clear inine-cache when constant's
	  visibility is modified. [ruby-dev:44929]

	* test/ruby/test_module.rb (test_private_constants_clear_inlinecache):
	  add test for it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 18:12:08 +00:00
marcandre
ca42d13e85 merge revision(s) 34535:
* array.c: Fix rdoc for Array#select!
          patched by b t [ruby-core:42478] [Bug #5998]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 17:46:03 +00:00
naruse
2c5d6bae4d merge revision(s) 33485:
* lib/openssl/buffering.rb: Force multi-byte strings to be treated as
	  binary data.

	* test/openssl/test_ssl.rb: Add test for it.
	Thanks to Niklas Baumstark for reporting the issue!
	[Ruby 1.9 - Bug #5233] [ruby-core:39120]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 17:27:22 +00:00
naruse
c3e465b5ee merge revision(s) 33795,33796:
* lib/set.rb (SortedSet.setup): don't remove old_init.  The remove
	  makes the warning prevention fragile.  [ruby-dev:44892]

	* lib/set.rb (SortedSet.setup): remove old_init after initialize
	  method is redefined.  The remove before redefinition makes the
	  warning prevention fragile.  [ruby-dev:44892]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 08:28:48 +00:00
naruse
d91a05c887 merge revision(s) 34033: [Backport #5996]
* thread_pthread.c (rb_thread_create_timer_thread): fix memory
	  leak. [ruby-dev:44904] [Bug #5688]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10 08:02:56 +00:00
naruse
513b0988f0 merge revision(s) 33517:
------------------------------------------------------------------------
r33517 | naruse | 2011-10-24 15:41:57 +0900 (Mon, 24 Oct 2011) | 6 lines

Follow the error format changed by FreeBSD 9.

FreeBSD 8.2's last line is
"./configure: Can't open ./configure: No such file or directory\n""
but FreeBSD 9's is
"cannot open ./configure: No such file or directory\n"".
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 21:13:27 +00:00
naruse
4bfa061e52 Partially revert r27949.
* cont.c (fiber_setcontext): Use longjmp() instead of swapcontext() on
  FreeBSD 9. [ruby-dev:41316] [Bug #3295] [Bug #5526]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 20:25:01 +00:00
naruse
47bb7f37a1 merge revision(s) 34277: [Backport #5881]
* object.c: Added examples for Object#is_a? and
	  Object#instance_of? patcheed from Manoj Kumar.
	  [Bug #5880] [ruby-core:42057]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 20:13:30 +00:00
naruse
36b3d5577c merge revision(s) 34409,34412,34417:
* io.c (argf_close): skip stdin, which should be readable again.
	  [ruby-dev:45160] [Bug #5952]

	* io.c (argf_readlines): reinitialize after all read to be
	  readable again.

	* io.c (argf_next_argv): reset ARGF.next_p on ARGV.replace.
	  r34409 breaks replacing ARGV.
	  [ruby-dev:45160] [Bug #5952]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 20:12:02 +00:00
emboss
0234bcfd19 * backport r34482 from trunk
* ext/openssl/ossl_ssl.c: Add SSL constants and allow to unset SSL
  option to prevent BEAST attack. See [Bug #5353].

  In OpenSSL, OP_DONT_INSERT_EMPTY_FRAGMENTS is used to prevent
  TLS-CBC-IV vulunerability described at
  http://www.openssl.org/~bodo/tls-cbc.txt
  It's known issue of TLSv1/SSLv3 but it attracts lots of attention
  these days as BEAST attack. (CVE-2011-3389)

  Until now ossl sets OP_ALL at SSLContext allocation and call
  SSL_CTX_set_options at connection.  SSL_CTX_set_options updates the
  value by using |= so bits set by OP_ALL cannot be unset afterwards.
  This commit changes to call SSL_CTX_set_options only 1 time for each
  SSLContext. It sets the specified value if SSLContext#options= are
  called and sets OP_ALL if not.

  To help users to unset bits in OP_ALL, this commit also adds several
  constant to SSL such as
  OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS.  These constants were
  not exposed in Ruby because there's no way to unset bits in OP_ALL
  before.

  Following is an example to enable 0/n split for BEAST prevention.

    ctx.options = OP_ALL & ~OP_DONT_INSERT_EMPTY_FRAGMENTS

* test/openssl/test_ssl.rb: Test above option exists.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 17:04:41 +00:00
svn
4f193625c3 * 2012-02-10
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 15:16:01 +00:00
nobu
5c99e2f633 * ext/fiddle/fiddle.c (Init_fiddle): declare in modern style.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 15:15:57 +00:00
nagachika
aabd3d0beb * ChangeLog: remove duplicated entries.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 14:18:58 +00:00
naruse
475f86f451 merge revision(s) 33410:
* cont.c (cont_mark): mark original Thread object from saved_thread.
	  [ruby-dev:44567] [Bug #5386]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 08:08:46 +00:00
naruse
44cf55ac16 merge revision(s) 32875:
* cont.c (HAVE_GETCONTEXT): see getcontext(3) because DragonFly BSD
	  x64 port doesn't have it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 08:05:21 +00:00
naruse
b97d91dd4a merge revision(s) 34504,34506,34507,34508:
* ext/dl/lib/types.rb: Win64 support.

	* ext/fiddle/conversions.c (value_to_generic): src is not guranteed as
	  a Bignum if the type is LONG_LONG.  it may be a Fixnum if the value
	  is small.

	* ext/dl/lib/value.rb (DL::ValueUtil.{unsigned_value,signed_value}):
	  currenly pack/unpack does not accept "q!" and "Q!".

	* test/ruby/memory_status.rb (Memory::Win32): 64bit support.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 07:20:53 +00:00
nobu
c65134a327 * remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 03:25:07 +00:00
naruse
8b322b5cf6 merge revision(s) 34338-34340: [Backport #5909]
* test/ruby/test_file_exhaustive.rb (test_expand_path): add tests for
	  absolute paths and drive letters.  [ruby-core:42177]

	* test/ruby/test_file_exhaustive.rb (test_expand_path): ignore case of
	  paths on DOSISH platforms.

	* test/ruby/test_file_exhaustive.rb (test_expand_path): fix commit
	  miss, removed surplus downcase.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 02:23:16 +00:00
naruse
6b3ba6912a merge revision(s) 33959,33963,34265:
* ext/dbm/extconf.rb: detect gdbm_version in libgdbm.

	* ext/dbm/dbm.c: make DBM::VERSION more informative for gdbm, qdbm and
	  Berkeley DB 1.x.  [ruby-dev:44944]

	* ext/dbm/dbm.c: use db_version() instead of DB_VERSION_STRING to
	  detect runtime Berkeley DB version.
	  use dpversion instead of _QDBM_VERSION to detect runtime QDBM
	  version.
	  [ruby-dev:44948]

	* ext/dbm/dbm.c (Init_dbm): fix a build error on mswin32.
	  use `extern __declspec(dllimport)` for dll link with VC.
	  [ruby-core:41996] [Bug #5869]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 02:12:10 +00:00
naruse
e0f8351d55 merge revision(s) 34236: [Backport #5890]
* numeric.c (rb_enc_uint_char): raise RangeError when added codepoint
	  is invalid. [Feature #5855] [Bug #5863] [Bug #5864]

	* string.c (rb_str_concat): ditto.

	* string.c (rb_str_concat): set encoding as ASCII-8BIT when the string
	  is US-ASCII and the argument is an integer greater than 127.

	* regenc.c (onigenc_mb2_code_to_mbclen): rearrange error code.

	* enc/euc_jp.c (code_to_mbclen): ditto.

	* enc/shift_jis.c (code_to_mbclen): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 22:34:12 +00:00
naruse
2bd2ea829f merge revision(s) 34499:
* test/pathname/test_pathname.rb: not read but binread.
	  patched by Benoit Daloze, [ruby-core:42440] [Bug #5984]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 22:31:55 +00:00
naruse
42c6255260 merge revision(s) 34497:
------------------------------------------------------------------------
r34497 | naruse | 2012-02-09 03:29:52 +0900 (Thu, 09 Feb 2012) | 1 line

FreeBSD needs multiple -o.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 18:30:35 +00:00
nobu
c709040b3f * test/-ext-/string/test_modify_expand.rb: test for r34492.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 13:35:27 +00:00
nobu
4e39dc864c * string.c (rb_str_modify_expand): fix memory leak.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 13:30:04 +00:00
naruse
9a57bc8f55 merge revision(s) 34490: [Backport #5983]
------------------------------------------------------------------------
r34490 | naruse | 2012-02-08 20:47:00 +0900 (Wed, 08 Feb 2012) | 1 line

Fix condition.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 11:47:47 +00:00
naruse
ee19d5864e merge revision(s) 34481,34488: [Backport #5983]
* ext/openssl/ossl_x509name.c: Use the numerical representation of
	  unrecognized OIDs instead of the sn "UNDEF".
	  

	* test/openssl/test_x509name.rb: Add tests for the fixed behavior.
	  
	  Patch provided by Paul Kehrer, thank you!
	  [ruby-core:41769] [Feature #5787]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 09:51:53 +00:00
naruse
9e2e9208f7 merge revision(s) 34394,34398:
------------------------------------------------------------------------
r34394 | naruse | 2012-01-29 23:24:05 +0900 (Sun, 29 Jan 2012) | 1 line

Skip test if locale is not Japanese nor UTF-8.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 06:42:39 +00:00
naruse
d66b539d88 merge revision(s) 34391:
* ext/readline/readline.c (readline_attempted_completion_function):
	  respect encodings.  [Bug #5941]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 02:01:28 +00:00
naruse
36cfe460a0 merge revision(s) 34254,34256:
* ext/readline/readline.c (readline_attempted_completion_function):
	  empty completion result does not mean memory error.

	* ext/readline/readline.c (readline_attempted_completion_function):
	  fix compile error.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:58:31 +00:00
naruse
381821deea merge revision(s) 34116:
* ext/readline/readline.c (readline_readline): check if outstream
	  is closed to get rid of a bug of readline 6.  [ruby-dev:45043]
	  [Bug #5803]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:55:01 +00:00
naruse
4051fadb54 merge revision(s) 33626:
* ext/readline/readline.c (Init_readline): like r18313, libedit's
	  replace_history_entry may use offset instead of which.
	  so introduce history_replace_offset_func and initialize it.

	* ext/readline/readline.c (hist_set): use history_replace_offset_func.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:54:38 +00:00
naruse
1a4d128124 merge revision(s) 33625:
* ext/readline/readline.c (Init_readline): fix wrong condition.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:52:42 +00:00
naruse
a9500bbccd merge revision(s) 33049:
* test/ruby/test_rubyoptions.rb (test_script_from_stdin): slave pty
	  should be manipulated because master pty may not be a tty on some
	  environment (e.g. Solaris). [Bug:#5222] [ruby-dev:44420]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:50:47 +00:00
naruse
d22e287763 merge revision(s) 33934: [Backport #5975]
* Makefile.in (CFLAGS): append ARCH_FLAG.

	* configure.in (ARCH_FLAG): exclude from CFLAGS.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:39:43 +00:00
naruse
9da8b41699 merge revision(s) 34123,34126,34127,34463: [Backport #5981]
* ext/openssl/ossl_cipher.c: Update and complete documentation.

	* ext/openssl/ossl_cipher.c: Add warning about key as IV.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:38:04 +00:00
naruse
a59554c7fb merge revision(s) 34469: [Backport #5982]
* ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.
	  Thanks to Mantas Mikulenas for noticing and providing a patch!
	  [ruby-core:42358] [Bug #5972]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:36:19 +00:00
naruse
e1dabb0fa3 merge revision(s) 34109:
* ext/readline/readline.c (readline_attempted_completion_function):
	  in Readline module with GNU Readline 6 case, Readline module
	  resets completion_append_character to " ", after it executes
	  completion. So, Readline module stores
	  completion_append_character, and Readline module always sets it
	  after Readline module executes completion. [ruby-dev:43456]
	  [Feature #4635]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:35:23 +00:00
naruse
b818c6e1db merge revision(s) 33762:
* test/ruby/test_sleep.rb (test_sleep_5sec): 0.1sec tolerance is too
	  small for busy environment.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 00:48:02 +00:00
naruse
4e3c928997 merge revision(s) 33673:
* test/dbm/test_dbm.rb: split tests for read only database.

	* test/gdbm/test_gdbm.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 00:46:28 +00:00
naruse
79634569e4 merge revision(s) 34028,34030:
* error.c (name_err_mesg_to_str): clear rb_thread_t::errinfo when
	  ignore exception under rb_protect().

	* test/ruby/test_exception.rb (test_exception_in_name_error_to_str):
	  add a corresponding test.
	  ignore exception under rb_protect(). [ruby-core:41612] [Bug #5755]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 00:44:05 +00:00
naruse
b7f40d86af merge revision(s) 33201,33249,33328: [Backport #5564]
* encoding.c (load_encoding): predefined encoding names are safe.
	  [ruby-dev:44469] [Bug #5279]

	* transcode.c (load_transcoder_entry): ditto.

	* encoding.c (require_enc): reject only loading from untrusted
	  load paths.  [ruby-dev:44541] [Bug #5279]

	* transcode.c (load_transcoder_entry): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 00:40:44 +00:00
nobu
911e4ee15a * removed trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-07 05:46:30 +00:00
nobu
882dda96a4 * ext/-test-/st/numhash/numhash.c (numhash_alloc): free st_table.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-07 05:43:49 +00:00
nobu
ad40f8a268 * st.c (st_foreach): should not yield same pair when checking
after unpacking.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-07 05:29:20 +00:00
ayumin
bdb4fa7084 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@34455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-07 05:04:02 +00:00