Commit graph

34260 commits

Author SHA1 Message Date
nagachika
3eb0620c2a merge revision(s) r45953,r45961: [Backport #9767]
* lib/test/unit/parallel.rb: fix test-all parallel failure if a test
	  is skipped after raise.
	  DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
	  But it causes Mashal.load failure due to undefined class/module
	  DL::DLError when doing test-all parallel and test-all doesn't
	  complete. We create new MiniTest::Skip object to avoid Mashal.load
	  failure.
	  [ruby-core:62133] [Bug #9767]

	* test/testunit/test_parallel.rb (TestParallel): add a test.

	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
	  But it causes Marshal.load failure due to undefined class/module
	  complete. We create new MiniTest::Skip object to avoid Marshal.load


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 14:53:36 +00:00
nagachika
fa2937a16a merge revision(s) r45034,r45037:
* test/socket/test_addrinfo.rb: remove unused variables.

	* test/socket/test_nonblock.rb: ditto.

	* test/socket/test_socket.rb: ditto.

	* test/socket/test_unix.rb: ditto.

	* test/testunit/test_parallel.rb: ditto.

	* test/webrick/test_filehandler.rb: ditto.

	* test/xmlrpc/test_features.rb: ditto.

	* test/zlib/test_zlib.rb: ditto.

	* test/socket/test_socket.rb: unix socket is required by test case.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 14:49:07 +00:00
nagachika
5807ff68f5 merge revision(s) r45827: [Backport #9618]
* ext/pathname/lib/pathname.rb (cleanpath_aggressive): make all
	  separators File::SEPARATOR from File::ALT_SEPARATOR.
	  Reported by Daniel Rikowski.
	  Fixed by Nobuyoshi Nakada.  [Bug #9618]

	* ext/pathname/lib/pathname.rb (cleanpath_conservative): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 14:05:38 +00:00
nagachika
b22467dab1 merge revision(s) r45720: [Backport #9571]
* lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
	  ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
	  directory is not an empty directory, rmdir() shall fail and set
	  errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
	  [Bug #9571] [ruby-dev:48017]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 14:03:41 +00:00
nagachika
61754d1a6a merge revision(s) r45144: [Backport #9544]
* lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
	  security.mac.portacl.port_high is changed.
	  See mac_portacl(4) for details.
	  Reported by Jakub Szafranski.  [ruby-core:60917] [Bug #9544]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 13:44:14 +00:00
nagachika
a5b229bebf merge revision(s) r46899,r46903,r46904:
split assertions into algorithms

	CentOS 7 seems finish MD5 support
	20140722T140010Z.fail.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 13:29:52 +00:00
nagachika
f8048f7817 merge revision(s) r46344: [Backport #9902]
* re.c (match_aref): should not ignore name after NUL byte.
	  [ruby-dev:48275] [Bug #9902]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-18 16:46:45 +00:00
nagachika
30c0ad5563 merge revision(s) r44516,r46159,r46196: [Backport #8523]
test_timeout.rb: shorten waiting times
	* test/test_timeout.rb (test_timeout): inverted test condition.
	  [Bug #8523]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-13 14:35:17 +00:00
nagachika
9bc1b8e9a0 merge revision(s) r46368,r46371: [Backport #9913]
* ext/digest/digest.c (rb_digest_instance_equal):
	  fix #== for non-string arguments. [ruby-core:62967] [Bug #9913]

	* test/digest/test_digest.rb: add test for above.

	* ext/digest/digest.c (rb_digest_instance_equal): no need to call
	  `to_s` twice.  [Bug #9913]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-13 14:24:26 +00:00
nagachika
99ea5ebb9e merge revision(s) r46417,r46418: [Backport #9939]
* array.c (yield_indexed_values): extract from permute0(),
	  rpermute0(), and rcombinate0().

	* array.c (rb_ary_combination): iterate on a shared copy, and use
	  array of indexes instead of array of chosen objects.
	  [ruby-core:63149] [Bug #9939]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-13 14:16:37 +00:00
nagachika
aa8380e17a merge revision(s) r46416: [Backport #9942]
* array.c (rb_ary_permutation): `p` is the array of size `r`, as
	  commented at permute0().  since `n >= r` here, buffer overflow
	  never happened, just reduce unnecessary allocation though.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-13 14:08:48 +00:00
nagachika
5c1a69452b merge revision(s) r46778: [Backport #10019]
* pack.c (encodes): fix buffer overrun by tail_lf.  Thanks to
	  Mamoru Tasaka and Tomas Hoger.  [ruby-core:63604] [Bug #10019]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-13 13:59:09 +00:00
nagachika
5643bc5ae0 merge revision(s) r45423,r45424: [Backport #9674]
* ext/thread/thread.c (undumpable): ConditionVariable and Queue
	  are not dumpable.  [ruby-core:61677] [Bug #9674]

	* marshal.c (w_object): internal objects are not dumpable.
	  [ruby-core:61677] [Bug #9674]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-13 13:51:07 +00:00
nagachika
feea0a9e82 merge revision(s) r46780: [Backport #9499]
* lib/matrix.rb: Fix sign for cross_product [#9499]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-11 14:08:51 +00:00
nagachika
068a7dff12 merge revision(s) r45642,r45643: [Backport #9646] [Backport #9729]
* st.c (st_foreach_check): chnage start point of search at check
	  from top to current. [ruby-dev:48047] [Bug #9646]

	* st.c (st_foreach_check): change start point of search at check


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-06 14:28:18 +00:00
nagachika
1fe220dc0b merge revision(s) r45344: [Backport #9543]
* lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-06 13:57:45 +00:00
nagachika
5fdc9a2e08 merge revision(s) r46099: [Backport #9814]
* enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
	  Patch by Erik Hollembeak [Bug #9814]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-03 15:46:17 +00:00
nagachika
aa04a7221d merge revision(s) r46095: [Backport #9819]
* enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
	  Patch submitted via documenting-ruby/ruby#34


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-03 15:44:54 +00:00
nagachika
95338ad304 merge revision(s) r45896: [Backport #9773]
* man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-03 15:43:12 +00:00
nagachika
e363464b86 merge revision(s) r45786: [Backport #9738]
* lib/rinda/tuplespace.rb: fix document. [ruby-core:62003][Bug #9738]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-03 15:41:30 +00:00
nagachika
598fc49d41 merge revision(s) r45462,r45463,r45466: [Backport #9684]
* struct.c (not_a_member): extract name error and use same error
	  messages.  based on the patch by Marcus Stollsteimer <sto.mar AT
	  web.de> at [ruby-core:61721].  [Bug #9684]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-03 15:37:51 +00:00
nagachika
2d90c01a1e merge revision(s) r45495: [Backport #9662]
* README.EXT: fix typo.
  [ruby-core:61634] [Bug #9662]

	* README.EXT.ja: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-02 16:55:39 +00:00
nagachika
5ab6933781 merge revision(s) r45858,r45859,r45860,r45861,r46638: [Backport #9811]
numeric.c: indent

	* numeric.c (ruby_num_interval_step_size): adjust indent.
	* numeric.c (num_step_scan_args): check keyword arguments and fail
	  if they conflict with positional arguments.
	  [ruby-dev:48177] [Bug #9811]

	* numeric.c (num_step_scan_args): table argument of rb_get_kwargs() is
	  array of IDs, not Symbols. [ruby-dev:48353] [Bug #9811]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-02 16:27:21 +00:00
nagachika
428a637f0f merge revision(s) r46360,r46372: [Backport #8625]
* io.c (io_setstrbuf, io_read): should not shorten the given buffer until
	  read succeeds.  [ruby-core:55951] [Bug #8625]

	* io.c (read_all): truncate the buffer before appending read data,
	  instead of truncating before reading.
	  [ruby-core:55951] [Bug #8625]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-30 18:12:05 +00:00
nagachika
09cf452926 merge revision(s) r45399,r45400,r46036,r46037: [Backport #416]
vm.c: merge code

	* vm.c (m_core_hash_from_ary, m_core_hash_merge_ary): merge
  duplicated code.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-30 18:02:23 +00:00
nagachika
370e83b789 merge revision(s) r46342: [Backport #9954]
* vm.c (core_hash_merge_kwd): should return the result hash, which
	  may be converted from and differ from the given argument.
	  [ruby-core:62921] [Bug #9898]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 18:22:39 +00:00
nagachika
bdab29b10a merge revision(s) r46457,r46458: [Backport #9949]
* lib/net/ftp.rb (gets, readline): read lines without LF properly.
	  [ruby-core:63205] [Bug #9949]

	* test/net/ftp/test_buffered_socket.rb: related test.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 18:08:43 +00:00
nagachika
dfba910f74 merge revision(s) r46331: [Backport #9885]
* lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body
	  type as "MIXED" followed immediately by params
	  [ruby-core:62864] [Bug #9885]
	  Patch by @rayners (David Raynes). [Fixes GH-622] 
	  https://github.com/ruby/ruby/pull/622


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 18:01:18 +00:00
nagachika
d681d9ce67 merge revision(s) r46233: [Backport #9878]
* signal.c (ruby_signal): should return either `old.sa_sigaction`
	  or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in
	  `old.sa_flags`, because they may not be a union.
	  [ruby-core:62836] [Bug #9878]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 17:56:19 +00:00
nagachika
39d963422f merge revision(s) r46075: [Backport #9856]
* process.c (proc_getgroups, proc_setgroups): use ALLOCV_N
	  [Bug #9856]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 17:43:01 +00:00
nagachika
7d49e2bfc1 merge revision(s) r45979: [Backport #9847]
* io.c (io_setstrbuf): always check if the buffer is modifiable.
	  [ruby-core:62643] [Bug #9847]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 17:34:43 +00:00
nagachika
4c5d8bebe8 merge revision(s) r45863,r45871: [Backport #9750]
* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#accept):
	  Consider Socket#accept as well as TCPServer#accept.
	  Reported by Sam Stelfox.  [ruby-core:62064] [Bug #9750]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 17:26:54 +00:00
nagachika
1ff2d59ebb merge revision(s) r45793: [Backport #9608]
* complex.c (parse_comp): replace ALLOCA_N with ALLOCV_N/ALLOCV_END
	  [Bug #9608]

	* rational.c (read_digits): ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 17:21:30 +00:00
nagachika
0caeba64c3 merge revision(s) r46098: [Backport #9861]
* vsnprintf.c (BSD_vfprintf): fix string width when precision is
	  given.  as the result of `memchr` is NULL or its offset from the
	  start cannot exceed the size, the comparison was always false.
	  [ruby-core:62737] [Bug #9861]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 17:17:20 +00:00
nagachika
8a33324477 merge revision(s) r44505: [Backport #9994]
numeric.c: isfinite

	* numeric.c (flo_is_finite_p): prefer C99 standard isfinite() than
  deprecated finite().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 17:09:10 +00:00
nagachika
1121fa0e4a merge revision(s) r46485: [Backport #9897]
* ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION
	  with 3-digit.  libffi 3.1 returns just 2-digit.
	  [ruby-core:62920] [Bug #9897]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 16:59:36 +00:00
nagachika
bdf635bf5b merge revision(s) r44535,r44536: [Backport #9321]
* vm.c (rb_vm_pop_cfunc_frame): added.  It cares c_return event.
	  The patch base by drkaes (Stefan Kaes).
	  [Bug #9321]

	* variable.c (rb_mod_const_missing): use rb_vm_pop_cfunc_frame()
	  instead of rb_frame_pop().

	* vm_eval.c (raise_method_missing): ditto.

	* vm_eval.c (rb_iterate): ditto.

	* internal.h (rb_vm_pop_cfunc_frame): add decl.

	* test/ruby/test_settracefunc.rb: add tests.
	  provided by drkaes (Stefan Kaes).

	* vm.c, eval.c, include/ruby/intern.h (rb_frame_pop): 
	  move definition of rb_frame_pop() and deprecate it.
	  It doesn't care about `return' events.

	* vm.c, eval.c, include/ruby/intern.h (rb_frame_pop):


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-29 16:13:14 +00:00
nagachika
b18ab01b09 merge revision(s) r46598: [Backport #9991]
* lib/webrick/utils.rb (create_listeners): Close socket objects.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-28 16:41:52 +00:00
nagachika
108828f680 merge revision(s) r46243,r46244: [Backport #9882] [Backport #9883]
* string.c (rb_str_substr): need to reset code range for shared
	  string too, not only copied string.
	  [ruby-core:62842] [Bug #9882]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-28 07:42:19 +00:00
nagachika
416f0075a2 merge revision(s) r45845,r45846,r45847: [Backport #9486]
* parse.y (local_tbl_gen): remove local variables duplicated with
	  arguments.

	* parse.y (new_bv_gen): no duplicated names, if already added in
	  shadowing_lvar().
	  [ruby-core:60501] [Bug #9486]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-28 05:51:57 +00:00
nagachika
85a3ceafec merge revision(s) r45540: [Backport #9911]
ossl.c: OPENSSL_LIBRARY_VERSION

	* ext/openssl/ossl.c (Init_openssl): add constant OPENSSL_LIBRARY_VERSION
  which tells the version running OpenSSL.  [EXPERIMENTAL]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-23 16:03:42 +00:00
nagachika
80831f0e11 merge revision(s) r46313: [Backport #9896]
* eval.c (rb_using_refinement): add write-barriers for
	  cref->nd_refinements.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-23 15:27:46 +00:00
nagachika
12ac28e2a5 merge revision(s) r46182: [Backport #9872]
* lib/net/ftp.rb (transfercmd): Close TCP server socket even if an
	  exception occur.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-23 15:19:51 +00:00
nagachika
c22cbdc130 merge revision(s) r45947,r45951: [Backport #9739] [Backport #9844]
* thread_win32.c (rb_w32_stack_overflow_handler): use Structured
	  Exception Handling by Addvectoredexceptionhandler() for machine
	  stack overflow on mingw.
	  This would be equivalent to the handling using __try and __exept
	  on mswin introduced by r43748.
	  Exception Handling by AddVectoredExceptionHandler() for machine
	  This would be equivalent to the handling using __try and __except


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-23 15:08:11 +00:00
svn
e9373b36c8 * 2014-06-24
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-23 15:02:32 +00:00
nagachika
a5b0009c05 merge revision(s) r46194: [Backport #9835]
* signal.c (signal_exec): ignore immediate cmd for SIG_IGN

	* signal.c (trap_handler): set cmd to true for SIG_IGN

	* signal.c (trap): handle nil and true values for oldcmd
	  [Bug #9835]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-23 15:02:21 +00:00
nagachika
9f982bd59d merge revision(s) r45874: [Backport #9813]
* class.c (rb_mod_init_copy): always clear instance variable,
	  constant and method tables first, regardless the source tables.
	  [ruby-dev:48182] [Bug #9813]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-22 17:52:26 +00:00
nagachika
07ac36ada5 merge revision(s) r45899: [Backport #9751]
* thread.c (thread_start_func_2): stop if forked in a sub-thread,
	  the thread has become the main thread.
	  [ruby-core:62070] [Bug #9751]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-22 17:44:28 +00:00
nagachika
b3cbe25173 merge revision(s) r46060: [Backport #9627]
* net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing
	  for messages not ending with a new-line.
	  [ruby-core:61441] [Bug #9627] [fix GH-616]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-22 16:53:59 +00:00
nagachika
ced638cc0f merge revision(s) r44712,r44715,r44716,r44722,r44725,r44726,r44753: [Backport #9454] [Backport #9828]
* thread_pthread.c: get current main thread stack size, which may
	  be expanded than allocated size at initialization, by rlimit().
	  [ruby-core:60113] [Bug #9454]

	* thread_pthread.c: rlimit is only available on Linux.
	  At least r44712 breaks FreeBSD.
	  [ruby-core:60113] [Bug #9454]

	* thread_pthread.c (ruby_init_stack, ruby_stack_overflowed_p):
	  place get_stack above others to get stack boundary information.
	  [ruby-core:60113] [Bug #9454]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-19 15:56:56 +00:00