Commit graph

20617 commits

Author SHA1 Message Date
hone
5d9f08f3d9 bump patchlevel
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@47094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-08-07 04:59:58 +00:00
hone
7b9354af88 Fix r32622.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@47093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-08-07 04:59:56 +00:00
hone
5082e91876 merge revision(s) 32622:
* lib/uri/generic.rb (WFKV_): unroll the loop of regexp.

* lib/uri/generic.rb (URI.decode_www_form_component): ditto.

Conflicts:
	ChangeLog
	lib/uri/common.rb

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@47092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-08-07 04:59:52 +00:00
hone
85940811e2 bump patchlevel
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@46555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-25 18:54:45 +00:00
svn
7252b67d81 * 2014-06-26
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@46554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-25 18:50:51 +00:00
hone
f8f3b03c0c fix quoting bug for make dist
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@46553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-25 18:50:45 +00:00
naruse
d1b23d1f78 merge revision(s) 36533:
* tool/ytab.sed: fix for Bison 2.6.




git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@44682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-22 17:41:54 +00:00
hone
2b93dbd8e7 merge revision(s) 43775: [Fixes GH-458]
https://github.com/ruby/ruby/pull/458

   * util.c (ruby_strtod): ignore too long fraction part, which does not
     affect the result.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@44353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-22 23:41:16 +00:00
naruse
e80d0a9631 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_2@40305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 05:58:19 +00:00
naruse
a840645f91 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_2@40303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 02:00:45 +00:00
nobu
ac3be749d5 merge revision(s) 27939,29703,29704,30164:
* ruby.c (ruby_init_loadpath_safe): use real path for non-shared
	  build.
	* configure.in (LIBRUBY_RELATIVE): use rpath token expansion.
	* tool/rbinstall.rb (bin-comm): prepend prolog shell script if
	  necessary.
	* ruby.c (ruby_init_loadpath_safe): relatively called non-shared
	  binary cannot be found in PATH, so use given pathname.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-22 02:09:55 +00:00
svn
2c7e082f47 * 2012-05-21
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-21 07:29:04 +00:00
knu
ccb34ee954 * ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
module before calling rb_class2name().




git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-21 07:28:54 +00:00
nobu
2c2b8637c3 * version.h: bump up patchlevel.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-18 09:19:41 +00:00
svn
1e3c758b28 * 2012-05-18
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-18 09:14:02 +00:00
nobu
86988c7d5e [ruby-dev:45650]
* lib/mkmf.rb (MakeMakefile#configuration): keep space at end of
  OUTFLAG and COUTFLAG.  [ruby-dev:45650]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-18 09:13:47 +00:00
nobu
9c3bf9bec4 * ext/bigdecimal/bigdecimal.c (PUSH): to prevent VALUE from GC,
must not cast it to unsigned long, which may be shorter than
	  VALUE, and the result can be mere garbage.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-11 05:09:58 +00:00
drbrain
2867611fe5 * lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem: Removed to avoid
conflict with ca-bundle.pem
* lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem:
  ditto.
* lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem:
  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-20 03:43:03 +00:00
svn
e349193884 * 2012-04-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-20 00:10:16 +00:00
drbrain
6253fbea8a Backport security fixes for RubyGems 1.3.7:
* lib/rubygems:  Apply the following security fixes to RubyGems 1.3.7:

  RubyGems now disallows redirection from HTTPS to HTTP.

  RubyGems now verifies SSL connections.

  Patch by Hiroshi Nakamura.
* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@35407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-20 00:10:09 +00:00
svn
b570f60d86 * 2012-02-18
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-18 09:00:06 +00:00
yugui
cfdd154b90 merges r28134 from trunk into ruby_1_9_2.
--
Allow bin/* install from dot-dirs. Fixes rvm and multiruby installations.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-18 09:00:02 +00:00
yugui
80e35fa21c merges r33532 from trunk into ruby_1_9_2.
--
* 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_2@34675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-18 08:59:57 +00:00
okkez
cedd050e4d merge revision(s) 34033: [Backport #5997]
* 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_2@34583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-13 15:29:27 +00:00
svn
fada2e46bb * 2012-02-10
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 17:20:59 +00:00
emboss
85fd9aadd1 * 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_2@34525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-09 17:20:52 +00:00
svn
84a48ac725 * 2012-02-05
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-05 03:27:43 +00:00
yugui
b657c159e9 merges r32349 from trunk into ruby_1_9_2.
--
* string.c (tr_trans): free heap ptr when the str is not embeded.
  patched by Eric Wong. [Bug #4956] [ruby-core:37708]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-05 03:27:41 +00:00
yugui
83b5388b25 merges r32347 from trunk into ruby_1_9_2.
--
* vm_insnhelper.c (vm_getivar): check vm state version
  to invalidate inline chache (ivar index).
  fixes Bug #4926.
* vm_insnhelper.c (vm_setivar): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-05 03:27:37 +00:00
nobu
eb40744739 * doc/re.rdoc (Repetition): fix typo. reported by Ori Avtalion
and patched by Zachary Scott.  [Bug #5947]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-01 00:50:17 +00:00
svn
74b68db34b * 2012-02-01
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-31 19:11:11 +00:00
tenderlove
9cea14a838 merging r34364 from trunk into ruby_1_9_2
--
* 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_2@34407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-31 19:11:05 +00:00
svn
22271afb58 * 2012-01-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-16 07:42:18 +00:00
nobu
2a1b0f247d * lib/optparse.rb (Regexp): fix incorrect options when casting to
a Regexp, and suppress encoding option warnings.
  https://github.com/ruby/ruby/pull/82


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-16 07:42:01 +00:00
svn
0634c325a6 * 2012-01-10
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-10 07:13:13 +00:00
nobu
1e0e3b168b * test/ruby/test_enumerator.rb (test_nested_iteration): fix typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-10 07:13:04 +00:00
nobu
8b75c2fc5f * doc/ChangeLog-1.9.3, test/gdbm/test_gdbm.rb: fixed mingw typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-28 02:40:28 +00:00
svn
554397bcd1 * 2011-12-28
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-28 02:23:01 +00:00
nobu
31b097cad2 * lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
instead of typoed regexp.  [ruby-core:41829] [Bug #5817]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-28 02:22:52 +00:00
svn
63783f2c97 * 2011-12-18
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-17 19:26:47 +00:00
marcandre
42df538915 * NEWS: Add {Proc|{Unbound}Method}#parameters and typo fixes
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-17 19:26:43 +00:00
yugui
4197f337b9 merges r32345 from trunk into ruby_1_9_2.
--
* thread.c (rb_threadptr_check_signal): only wake up main thread.
* thread.c (rb_threadptr_execute_interrupts_common): check signal
  deliverly if it is main thread.
  fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
* bootstraptest/test_fork.rb: add a test for above.
* signal.c (rb_get_next_signal): skip if signal_buff is empty.
  (check signal_buff.size first)
* vm_core.h: remove unused variable rb_thread_t::exec_signal.
* thread.c (rb_thread_check_trap_pending): check
  rb_signal_buff_size() because rb_thread_t::exec_signal
  is no longer available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:39:16 +00:00
yugui
01d1a35a77 merges r32342 from trunk into ruby_1_9_2.
--
* class.c (Init_class_hierarchy): should name BasicObject
  explicitly.

* variable.c (rb_const_defined_0): should not check for
  superclasses as const_get.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:39:09 +00:00
yugui
3360e3e7ea merges r32334 and r32335 from trunk into ruby_1_9_2.
--
* vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event
  for methods defined by define_method().
* thread.c (call_trace_proc): Fix to skip if class is not given (0).
  Note that ID and Class object are passed for call/return event
  if the called method was defined by define_method().
  If you are author of tracer/profiler/debugger, this may be an
  important change.  You should check passed class as zero or
  non-zero instead of checking the event type.
* test/ruby/test_settracefunc.rb: add a test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:39:04 +00:00
yugui
e1fd55ae00 merges r32333 from trunk into ruby_1_9_2.
--
configure.in: Add warnflags for XL/C on AIX during configure
              to avoid [Bug #3971]. See [ruby-core:32859]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:38:58 +00:00
yugui
31a5ce34cd merges r32327 from trunk into ruby_1_9_2.
--
* test/ruby/test_module.rb: tests for [Bug #3422] and [Bug #3423].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:38:53 +00:00
yugui
03f06aa7af merges r32319 from trunk into ruby_1_9_2.
--
* thread_pthread.c (rb_thread_create_timer_thread): allocate
  machine stack for the timer thread at least 12KB.  FreeBSD 8.2
  AMD64 causes machine stack overflow (SIGSEGV) only with
  PTHREAD_STACK_MIN (maybe defined as 2KB).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:38:47 +00:00
yugui
ed034f0c5a merges r32298,r32299,r32300 and r32301 from trunk into ruby_1_9_2.
--
* thread.c (rb_thread_run): change RDoc. The old example is buggy
  and may cause deadlock. The patch is suggested by Heesob Park
  <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454]
--
* thread.c (rb_thread_wakeup): change RDoc sample code. The old
  example is buggy and may not display anything by a race.
  The patch is suggested by Heesob Parrk <phasis@gmail.com>.
  Thank you! [Bug #3606][ruby-core:31454]
--
* thread.c (rb_thread_stop): change RDoc sample code. The old
  example is buggy and may cause deadlock. The patch is
  suggested by Heesob Park <phasis@gmail.com>. Thank you!
  [Bug #3606][ruby-core:31454]
--
* thread.c (thread_s_pass): change RDoc description and remove
  a sample code. The actual implementaion never behave as explained by
  an example. It's a documentation bug.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:38:43 +00:00
yugui
301f92fe72 merges r32295 from trunk into ruby_1_9_2.
--
 * lib/irb/completion.rb: complate correctry string literal. fix [Bug #1145].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:38:36 +00:00
yugui
a0948d8334 merges r32288 and r32292 from trunk into ruby_1_9_2.
--
* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
--
* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): define only if not defined.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-11 00:38:30 +00:00