40234 Commits

Author SHA1 Message Date
normal
1e5a40ff18 openssl/buffering: fix gets on EOF with limit
* ext/openssl/lib/openssl/buffering.rb (gets):
  avoid comparing fixnum with nil
* test/openssl/test_pair.rb: test gets with limit when EOF is hit
  Thanks to Bar Hofesh <bar.hofesh@safe-t.com> for the bug report
  and testing.
  [ruby-core:70149] [Bug #11400]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-01 22:08:17 +00:00
ktsj
9cf11b70ca * lib/net/http/response.rb (Net::HTTPResponse::Inflater#finish):
fix a bug that empty gzipped response body causes Zlib::BufError.
  [ruby-core:68846] [Bug #11058]

* test/net/http/test_httpresponse.rb: tests for the above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-01 08:23:32 +00:00
ktsj
d7bb66df26 * lib/net/http/response.rb (Net::HTTPResponse#inflater):
fix TypeError. An exception object might be nil.
  [ruby-core:68846] [Bug #11058]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-01 08:22:50 +00:00
nobu
35a76874db thread.c: thread_shield_get_mutex
* thread.c (thread_shield_get_mutex): explicitly check if
  destroyed already.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-01 04:47:53 +00:00
tenderlove
d8225d9f04 * ext/openssl/ossl_ssl.c (ossl_sslctx_setup): Implement
SSLContext#options and options= using SSL_CTX_set_options and
  SSL_CTX_get_options. This reduces the number of ivars we need and
  simplifies `ossl_sslctx_setup`.

* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): Default `options`
  to SSL_OP_ALL

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-01 00:12:46 +00:00
tenderlove
bcc2641ed8 * ext/openssl/ossl_ssl.c (Init_ossl_ssl): OpenSSL declares these
constants as longs, so we should follow that and use LONG2NUM.
  http://git.io/vOqxD

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 22:01:49 +00:00
tenderlove
9fefa60637 * ext/openssl/ossl_ssl.c (ossl_call_tmp_dh_callback): change callback
to return the Ruby dh (or ecdh) object that the caller cares about
  instead of doing rb_iv_get / set to communicate.  This means we can
  remove an rb_iv_get call, and only use the set calls for their
  intended purpose (to prevent the object from being GC'd).

* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto
* ext/openssl/ossl_ssl.c (ossl_call_tmp_ecdh_callback): ditto
* ext/openssl/ossl_ssl.c (ossl_tmp_ecdh_callback): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 19:08:40 +00:00
tenderlove
2abc873732 * ext/openssl/ossl_ssl.c (ossl_call_tmp_dh_callback): Similarly to the
tmp_ecdh_callback, the SSLSocket instance always holds a reference
  to the SSLContext object (it's always set in `initialize`).  The
  SSLContext holds a reference to the tmp_dh_callback.  Ask the
  context for the callback instead of storing the callback in two
  places.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 18:51:30 +00:00
tenderlove
568ba1cfdb * ext/openssl/ossl_ssl.c (ossl_call_tmp_dh_callback): create an array
and use `rb_apply` to clean up calls to `rb_protect`.

* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 18:44:12 +00:00
tenderlove
cbb45e2f4e * ext/openssl/ossl_ssl.c (ossl_call_tmp_ecdh_callback): The SSL socket
always holds a reference to the SSLContext object, which will have
  the callback object.  Ask the context for the callback instead of
  storing the callback in two places.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 18:29:12 +00:00
svn
fa2040230c * 2015-08-01
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 18:20:48 +00:00
tenderlove
5b5d79c88b * ext/openssl/lib/openssl/ssl.rb (module OpenSSL): convert
`tmp_dh_callback` to Ruby, and call it when setting up an SSL
  connection.  This allows us to move the "default" behavior to the
  reader method.

* ext/openssl/ossl_ssl.c: call the tmp_dh_callback instead of
  accessing the SSLContext's internals.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 18:20:31 +00:00
svn
af13f15b50 * remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 14:38:29 +00:00
tenderlove
9896f4695a Update libssl before Travis build
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 14:36:42 +00:00
svn
d1cfb475c7 * 2015-07-31
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 12:35:07 +00:00
nobu
9a0f5286d7 load.c: use rb_load_internal0
* load.c (rb_require_internal): use rb_load_internal0 not to raise
  a exception to be caught.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-31 12:34:54 +00:00
nobu
b00ba0a957 test_settracefunc.rb: refine
* test/ruby/test_settracefunc.rb (test_isolated_raise_in_trace):
  check outputs.

* test/ruby/test_settracefunc.rb (test_recursive): method name
  which is internally called by TracePoint is now skipped.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 07:56:20 +00:00
nobu
2dffc6bba3 thread.c: identity hash
* thread.c (rb_uninterruptible): use identity hash for masking.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 07:56:02 +00:00
nobu
c3bd57d18e fix typo
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 07:23:24 +00:00
nobu
16ea9d948f common.mk: PHONY should be phony [ci skip]
* common.mk (PHONY): should not depend on any real files, not to
  make those dependencies inadvertently.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 06:30:38 +00:00
nobu
176414dfa7 test_pair.rb: join client thread
* test/openssl/test_pair.rb (test_ecdh_callback): join client
  thread only when it started.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 04:43:23 +00:00
nobu
fbc4d07087 envutil.rb: -w for assert_separately
* test/lib/envutil.rb (assert_separately): always add -w option
  for warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 04:33:00 +00:00
nobu
83cd51e3fe variable.c: Module#deprecate_constant
* variable.c (rb_const_get_0): warn deprecated constant reference.
* variable.c (rb_mod_deprecate_constant): mark constants to be
  warned as deprecated.  [Feature #11398]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 04:20:00 +00:00
nobu
c3f6e4ea07 NEWS: sort alphabetically
* NEWS (Core classes updates): sort classes/modules in
  alphabetical order.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 03:32:46 +00:00
nobu
f2240f1086 common.mk: no version.i
* common.mk (clean-local): version.i is no longer generated
  automatically.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 03:17:56 +00:00
nobu
56458959a8 thread.c: identical hash
* thread.c (rb_thread_s_handle_interrupt): make identical hash,
  to compare masking classes just by their IDs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 02:53:57 +00:00
nobu
2735af4daf load.c: stop separating exits at loading
* load.c (rb_load_internal0): stop separating exits at loading
  from exits from execution.  TAG_FATAL is the only case that
  `errinfo` is a Fixnum, and should continue to exit by JUMP_TAG
  but not raising as an ordinary exception.
  [ruby-core:70169] [Bug #11404]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 02:52:57 +00:00
nobu
bcba951320 load.c: avoid segfault when 'throw' occurs in the middle of rb_load_file_str
How can a 'throw' happen while the current thread is reading a Ruby source file
from disk and parsing it? It can happen if another thread calls Thread#raise,
and passes an Exception object which responds to #exception, and the custom #exception
method calls Kernel#throw.

In practice, this is most likely to happen if you combine the use of autoload and
Timeout.timeout.

An extra check is required to avoid a segfault in this case.

* load.c (rb_load_internal0): extra check before returning TAG_RAISE when a
  non-local transfer of control happens while loading and parsing a Ruby source file.
  [ruby-core:70169] [Bug #11404]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-30 01:42:35 +00:00
normal
d0240cbb6d st.c: constify st_table* in private functions
Minor size reduction on 32-bit x86:

   text	   data	    bss	    dec	    hex	filename
  13742	     24	      0	  13766	   35c6	st.o
  14166	     24	      0	  14190	   376e	st-orig.o

Public API change to be proposed separately.

* st.c (find_entry): constify st_table*
  (find_packed_index_from): ditto
  (find_packed_index): ditto
  (get_keys): ditto
  (get_values): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 23:55:23 +00:00
svn
669a2a359e * properties.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 19:55:11 +00:00
svn
cc7c75cea2 * 2015-07-30
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 19:54:24 +00:00
normal
cb87005f69 new benchmarks for hashing dsyms and fixnums
* benchmark/bm_hash_aref_dsym.rb: new benchmark
* benchmark/bm_hash_aref_dsym_long.rb: ditto
* benchmark/bm_hash_aref_fix.rb: ditto

[ruby-core:70129] [Bug #11396] pointed out we need to consider
more cases for hashing.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 19:54:12 +00:00
nobu
b729e9278f test_pair.rb: thread leak
* test/openssl/test_pair.rb (test_ecdh_callback): join client
  thread before closing sockets.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 12:45:32 +00:00
nobu
621bf532fc test_pair.rb: thread leak
* test/openssl/test_pair.rb (test_ecdh_callback): fix thread leak.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 12:41:09 +00:00
nobu
ede1c141c6 symbol.c: fix dynamic symbol hash value
* hash.c (any_hash), symbol.c (dsymbol_alloc): fix dynamic symbol
  hash value by restricting in Fixnum range, that is `long`.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 12:38:43 +00:00
nobu
184cf1f710 test_hash.rb: suppress warnings
* test/ruby/test_hash.rb (test_label_syntax): pass assertion
  message and suppress warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 12:35:42 +00:00
nobu
987df2ece6 hash.c: move rb_obj_hash
* hash.c (rb_obj_hash): move in order to share with rb_any_hash.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 08:25:49 +00:00
nobu
07900180ec fiddle: $LOCAL_LIBS needs to be expanded
* ext/fiddle/extconf.rb: revert part of r51401 and expand
  $LOCAL_LIBS as it will be extracted and copied to exts.mk.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 07:53:12 +00:00
nobu
6f65a0ebf2 string.c: empty non-embed case
* string.c (str_buf_cat): consider empty non-embed string case,
  not to loop infinitely.  [ruby-core:70074] [Bug #11383]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 07:00:25 +00:00
nobu
149dadf368 vm_eval.c: set method_missing_reason
* vm_eval.c (send_internal): set method_missing_reason before
  invoking overriding method_missing method so that the default
  method_missing can achieve it properly.
  [ruby-core:68515] [Bug #10969]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 06:25:21 +00:00
nobu
48f9012df9 hash.c: fix symbol hash
* hash.c (rb_sym_hash): return same value as rb_any_hash() of
  Symbol.  [Bug #9381]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 05:54:21 +00:00
nobu
efc7a3a712 hash.c: fix float hash
* hash.c (rb_any_hash): fix Float hash.  rb_dbl_hash() returns a
  Fixnum, but not a long.  [Bug #9381]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 05:53:35 +00:00
usa
8e613749f4 * test/ruby/test_io.rb (TestIO#test_open_flag_binary): typo of method name (test method itself, and calling method).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 05:32:38 +00:00
nobu
4de35bafbc test_hash.rb: add assertions
* test/ruby/test_hash.rb (test_wrapper_of_special_const): test
  other special obejcts.  [Bug #9381]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 05:06:32 +00:00
naruse
9ca6e62229 open the path instead of tempfile object
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51422 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 04:10:19 +00:00
nobu
6ef6757e46 internal.h: fix LIKELY
* internal.h (LIKELY, UNLIKELY): inverted conditions generate
  wrong code.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 03:37:24 +00:00
nobu
ef9d9423cc internal.h: ensure a boolean
* internal.h (LIKELY, UNLIKELY): make a boolean to enforce 1 or 0.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 02:13:00 +00:00
nobu
53e301a2d8 common.mk: fix conflict of version.i
* common.mk ($(arch)-fake.rb): read from STDIN instead of creating
  version.i, to get rid of conflict with tool/update-deps.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 02:06:38 +00:00
hsbt
c02ffd9a8f * gc.c: document argument passed to finalizer proc.
[fix GH-976][ci skip] Patch by @alexdowad

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 01:44:49 +00:00
naruse
72272159d8 refix r51329 and show thread information
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-29 01:39:17 +00:00