1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* removed trailing spaces.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-06-09 21:36:05 +00:00
parent f175918765
commit e6424f805b
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -5,8 +5,8 @@ Sun Jun 10 06:21:10 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
Sun Jun 10 03:09:41 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> Sun Jun 10 03:09:41 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
* ext/openssl/ossl.c: Fix error in example. Patch by David Albert. * ext/openssl/ossl.c: Fix error in example. Patch by David Albert.
Add/extend existing documentation. Examples now also cover RSA Add/extend existing documentation. Examples now also cover RSA
signatures and PBKDF2. signatures and PBKDF2.
[ruby-core: 45154][ruby-trunk - Bug #6475] [ruby-core: 45154][ruby-trunk - Bug #6475]
@ -18,7 +18,7 @@ Sun Jun 10 01:41:45 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
functionality introduced in r35797. The new callback approach functionality introduced in r35797. The new callback approach
gives clients maximum flexibility to decide on their own what to gives clients maximum flexibility to decide on their own what to
do on renegotiation attempts. do on renegotiation attempts.
Add documentation for SSL module and SSLError. Add documentation for SSL module and SSLError.
* test/openssl/test_ssl.rb: Add a test for * test/openssl/test_ssl.rb: Add a test for
SSLContext#renegotiation_cb. SSLContext#renegotiation_cb.
@ -74,7 +74,7 @@ Sat Jun 9 23:36:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sat Jun 9 22:27:05 2012 Tanaka Akira <akr@fsij.org> Sat Jun 9 22:27:05 2012 Tanaka Akira <akr@fsij.org>
* process.c (retry_fork): rewrite a complex "for" statement by * process.c (retry_fork): rewrite a complex "for" statement by
simple statements. simple statements.
Sat Jun 9 21:50:04 2012 Tanaka Akira <akr@fsij.org> Sat Jun 9 21:50:04 2012 Tanaka Akira <akr@fsij.org>
@ -105,9 +105,9 @@ Sat Jun 9 09:31:07 2012 Tanaka Akira <akr@fsij.org>
(rb_spawn): don't need to give default_close_others (rb_spawn): don't need to give default_close_others
argument for rb_spawn_internal. argument for rb_spawn_internal.
(rb_f_system): don't need to give default_close_others argument for (rb_f_system): don't need to give default_close_others argument for
rb_spawn_internal. rb_spawn_internal.
(rb_f_spawn): don't need to give default_close_others argument for (rb_f_spawn): don't need to give default_close_others argument for
rb_exec_arg_prepare. rb_exec_arg_prepare.
Sat Jun 9 09:00:58 2012 Tanaka Akira <akr@fsij.org> Sat Jun 9 09:00:58 2012 Tanaka Akira <akr@fsij.org>
@ -257,7 +257,7 @@ Wed Jun 6 20:45:08 2012 Tanaka Akira <akr@fsij.org>
(rb_exec_err): Give the absolute path of the invoking command for (rb_exec_err): Give the absolute path of the invoking command for
proc_exec_v, instead of the command name. proc_exec_v, instead of the command name.
* internal.h: add command_abspath field for rb_exec_arg. * internal.h: add command_abspath field for rb_exec_arg.
Wed Jun 6 20:08:01 2012 Tanaka Akira <akr@fsij.org> Wed Jun 6 20:08:01 2012 Tanaka Akira <akr@fsij.org>
@ -306,7 +306,7 @@ Wed Jun 6 00:20:37 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_exec_arg_init): don't return a value. * process.c (rb_exec_arg_init): don't return a value.
(rb_exec_arg_prepare): ditto. (rb_exec_arg_prepare): ditto.
(rb_spawn_process): don't take the prog argument. extract the (rb_spawn_process): don't take the prog argument. extract the
information from earg. information from earg.
(rb_spawn_internal): follow rb_spawn_process change. (rb_spawn_internal): follow rb_spawn_process change.
(rb_f_spawn): ditto. (rb_f_spawn): ditto.

8
NEWS
View File

@ -121,15 +121,15 @@ with all sufficient information, see the ChangeLog file.
raise NoMethodError in the same case. Constructing such values is still raise NoMethodError in the same case. Constructing such values is still
permitted. permitted.
* TLS 1.1 & 1.2 support by setting OpenSSL::SSL::SSLContext#ssl_version to * TLS 1.1 & 1.2 support by setting OpenSSL::SSL::SSLContext#ssl_version to
:TLSv1_2, :TLSv1_2_server, :TLSv1_2_client or :TLSv1_1, :TLSv1_1_server :TLSv1_2, :TLSv1_2_server, :TLSv1_2_client or :TLSv1_1, :TLSv1_1_server
:TLSv1_1_client. The version being effectively used can be queried :TLSv1_1_client. The version being effectively used can be queried
with OpenSSL::SSL#ssl_version. Furthermore, it is also possible to with OpenSSL::SSL#ssl_version. Furthermore, it is also possible to
blacklist the new TLS versions with OpenSSL::SSL:OP_NO_TLSv1_1 and blacklist the new TLS versions with OpenSSL::SSL:OP_NO_TLSv1_1 and
OpenSSL::SSL::OP_NO_TLSv1_2. OpenSSL::SSL::OP_NO_TLSv1_2.
* Added OpenSSL::SSL::SSLContext#renegotation_cb. A user-defined callback * Added OpenSSL::SSL::SSLContext#renegotation_cb. A user-defined callback
may be set which gets called whenever a new handshake is negotiated. This may be set which gets called whenever a new handshake is negotiated. This
also allows to programmatically decline (client) renegotiation attempts. also allows to programmatically decline (client) renegotiation attempts.
* Support for "0/n" splitting of records as BEAST mitigation via * Support for "0/n" splitting of records as BEAST mitigation via
OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS. OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS.
=== Language changes === Language changes

6
common.mk
View File

@ -763,7 +763,7 @@ debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \
id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) $(ID_H_INCLUDES) id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) $(ID_H_INCLUDES)
vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c \ vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c \
$(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) \ $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) \
{$(VPATH)}internal.h {$(VPATH)}iseq.h {$(VPATH)}internal.h {$(VPATH)}iseq.h
miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \ miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \
$(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h
prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \ prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \
@ -898,8 +898,8 @@ parse: miniruby$(EXEEXT) PHONY
$(MINIRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT) $(MINIRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
COMPARE_RUBY = $(BASERUBY) COMPARE_RUBY = $(BASERUBY)
ITEM = ITEM =
OPTS = OPTS =
benchmark: $(PROGRAM) PHONY benchmark: $(PROGRAM) PHONY
$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \ $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \

4
ia64.s
View File

@ -5,11 +5,11 @@
// //
// void rb_ia64_flushrs(void) { __builtin_ia64_flushrs(); } // void rb_ia64_flushrs(void) { __builtin_ia64_flushrs(); }
// void *rb_ia64_bsp(void) { return __builtin_ia64_bsp(); } // void *rb_ia64_bsp(void) { return __builtin_ia64_bsp(); }
// //
// Note that rb_ia64_flushrs and rb_ia64_bsp works in its own stack frame. // Note that rb_ia64_flushrs and rb_ia64_bsp works in its own stack frame.
// It's because BSP is updated by br.call/brl.call (not alloc instruction). // It's because BSP is updated by br.call/brl.call (not alloc instruction).
// So rb_ia64_flushrs flushes stack frames including caller's one. // So rb_ia64_flushrs flushes stack frames including caller's one.
// rb_ia64_bsp returns the address next to caller's register stack frame. // rb_ia64_bsp returns the address next to caller's register stack frame.
// //
// See also // See also
// Intel Itanium Architecture Software Developer's Manual // Intel Itanium Architecture Software Developer's Manual

2
insns.def
View File

@ -815,7 +815,7 @@ defined
args[0] = obj; args[1] = Qfalse; args[0] = obj; args[1] = Qfalse;
r = rb_check_funcall(v, rb_intern("respond_to_missing?"), 2, args); r = rb_check_funcall(v, rb_intern("respond_to_missing?"), 2, args);
if (r != Qundef && RTEST(r)) if (r != Qundef && RTEST(r))
expr_type = "method"; expr_type = "method";
} }
break; break;