summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-05-20* 2011-05-21svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20merge revision(s) 30401:shyouhei
* win32/README.win32: note to need NT based OS to build ruby. * win32/{configure.bat,setup.mak}: backport current build method from trunk. [ruby-dev:42893] (#4206) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20merge revision(s) 30274:30279:shyouhei
* Backported the fix at Mon Oct 4 09:30:42 2010 NARUSE, Yui <naruse@ruby-lang.org> * ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new accepts only Strings, so call Integer#to_s(16). 16 is for an optimization. [ruby-dev:42336] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Make test-all run. require_relative is from 1.9. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e * Backported the fix at Mon Sep 13 09:23:58 2010 NARUSE, Yui <naruse@ruby-lang.org> * ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison with rb_scan_args. Before this fix, OpenSSL::BN#prime? is fully broken. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> create mode 100644 test/openssl/test_bn.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-18merge revision(s) 30903:shyouhei
* test/ruby/test_exception.rb (TestException::test_to_s_taintness_propagation): Test for below. * error.c (exc_to_s): untainted strings can be tainted via Exception#to_s, which enables attackers to overwrite sane strings. Reported by: Yusuke Endoh <mame at tsg.ne.jp>. * error.c (name_err_to_s): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-18merge revision(s) 30905:shyouhei
* lib/fileutils.rb (FileUtils::remove_entry_secure): there is a race condition in the case where the given path is a directory, and some other user can move that directory, and create a symlink while this method is executing. Reported by: Nicholas Jefferson <nicholas at pythonic.com.au> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-18merge revision(s) 30604:shyouhei
* win32/win32.c (init_stdhandle): backport mistake of r29382. some code are needless in ruby 1.8. [ruby-core:34579] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-18* configure.in: revert revision r29854. This revision introducedshyouhei
binary incompatibilities on some circumstances. The bug that revision was fixing gets reopened by this reversion. [ruby-dev:43152] cf. [Bug #2553] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-23merge revision(s) 30302:shyouhei
* lib/resolv.rb (Resolv::IPv4::Regex): make it only accept 0 to 255. [ruby-core:29501] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20* 2010-12-21svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-20 * lib/webrick/https.rb: uninitialized instance variables.nahi
Backport a part of r20864 for ruby_1_8. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-04merge revision(s) 23240:shyouhei
* lib/mkmf.rb (init_mkmf): needs default library path even if cross compiling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-04merge revision(s) 29933:shyouhei
* re.c (rb_reg_regcomp): should succeed the taint status from the origin. [ruby-core:33338] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02* Makefile.in (fake.rb): need to expand the topdir in case of itshyouhei
being relative, a patch from Luis Lavena <luislavena at gmail.com>. [ruby-core:33466] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24 * ext/socket/extconf.rb: backrorted entirely from ruby_1_8, with smallshyouhei
modifications for the difference of mkmf.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24merge revision(s) 22932:shyouhei
* mkconfig.rb (patchlevel): config.status may not contain PATCHLEVEL even if other version numbers exist. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24 * win32/Makefile.sub ($(RCFILES)): no revision.h in thisshyouhei
branch, a patch from Luis Lavena <luislavena at gmail.com>. [ruby-core:33310] * cygwin/GNUmakefile.in ($(RCFILES)): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24merge revision(s) 29901:shyouhei
* ext/socket/extconf.rb (getaddrinfo): should initialize winsock on windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24merge revision(s) 29898:shyouhei
merge from trunk (r29767) * win32/setup.mak: use findstr.exe instead of find.exe, because all target build platforms should have findstr.exe, and, find.exe often means another command such as cygwin's. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24merge revision(s) 26140:shyouhei
* ext/stringio/stringio.c (strio_getline): fix for "" as separator. [ruby-dev:34591] (Backport r17739 by Yusuke Endoh from trunk). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24merge revision(s) 17430:shyouhei
* lib/net/pop.rb (Net::POP3#set_all_uids): speed up. a patch from <m-sumi AT techfirm.co.jp> [ruby-list:45047] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-24merge revisio(s) 29111:shyouhei
* lib/net/imap.rb (initialize): sets sync_close to true. Thanks, Hiroshi NAKAMURA. [ruby-core:31753] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-23 merge revision(s) 29333:shyouhei
* lib/pathname.rb (relative_path_from): backport r23093 and r25440 from ruby_1_9_2. [ruby-core:32415] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Mon, 22 Nov 2010 05:15:39 +0000 shyouhei ↵shyouhei
<shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 29849: merge revision(s) 28835,28894: * ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc version is older than 3.4.4. [ruby-core:31567] [Bug #3637] * ext/win32ole/extconf.rb: ditto. * ext/win32ole/win32ole.c: fix checking version of GCC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Fri, 19 Nov 2010 19:33:27 +0900 URABE, Shyouhei <shyouhei@ruby-lang.org>shyouhei
OK, this is 1.8.7 specific (rare!) * Makefile.in (fake.rb): hook needed to fake mkmf.rb. #2531 [ruby-core:27327] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Mon, 18 Oct 2010 01:23:48 +0000 naruse ↵shyouhei
<naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 29524: * lib/net/http.rb (transport_request): @socket may be nil. patched by Egbert Eich [ruby-core:32829] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Thu, 7 Oct 2010 09:10:47 +0000 nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>shyouhei
merge revision(s) 29420:29424: * cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on real config.rb file. [ruby-core:32709] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> * common.mk (RBCONFIG): depends on version.h due to RUBY_PATCHLEVEL. [ruby-core:32709] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Sun, 3 Oct 2010 09:30:30 +0000 nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>shyouhei
merge revision(s) 29396: * parse.y (rb_intern): should check symbol table overflow. #3900 [ruby-dev:42330] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Fri, 1 Oct 2010 06:13:32 +0000 usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>shyouhei
merge revision(s) 29382: * win32/win32.c (init_stdhandle): redirect unopened IOs to NUL. backport r11362 from trunk. [ruby-core:31445] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Mon, 23 Aug 2010 03:06:30 +0000 nahi ↵shyouhei
<nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 29071: * ext/openssl/ossl_asn1.c (obj_to_asn1bool): fixed ASN1::Boolean encoding issue for OpenSSL 1.0.0 compatibility. ASN1::Boolean.new(false).to_der wrongly generated "\1\1\377" which means 'true'. ASN1_TYPE_set of OpenSSL <= 0.9.8 treats value 0x100 as 'false' but OpenSSL >= 1.0.0 treats it as 'true'. ruby-ossl was using 0x100 for 'false' for backward compatibility. Just use 0x0 for the case OpenSSL >= OpenSSL 0.9.7. * test/openssl/test_asn1.rb: test added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Tue, 10 Aug 2010 08:36:00 +0000 naruse ↵shyouhei
<naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 28949: merge revision(s) 28945: * lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri): rollup leading slashes. [ruby-core:31657] patched by Jamison Wilde NOTE: //authority/path is valid relative URI both RFC2396 and RFC3986. So when give a relative URI-like string to URI lib, users must care leading slashes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Thu, 29 Jul 2010 23:33:21 +0000 nobu ↵shyouhei
<nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 28794:28796: * file.c (file_expand_path): should check if could find user. [ruby-core:31538] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> * file.c (file_expand_path): home directory must be absolute. [ruby-core:31537] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Thu, 29 Jul 2010 13:46:40 +0000 nahi ↵shyouhei
<nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 28784: * lib/webrick/ssl.rb (WEBrick::Utils.create_self_signed_cert): wrongly created dummy SSL certificate with version == 3 (no such version) and serial == 0 (must be >0). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Sat, 24 Jul 2010 06:49:35 +0000 suke ↵shyouhei
<suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 28378: * ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo. [ruby-core:31304][Bug #3576]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Thu, 8 Jul 2010 04:44:58 +0000 nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>shyouhei
merge revision(s) 28575,28620:28632: * test/openssl/test_config.c: added tests for all Config methods. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> * ext/openssl/ossl_config.c (ossl_config_copy): wrongly updating the given object with uninitialized CONF data. now OpenSSL::Config#clone works as expected; cloning the config instead of SEGV or empty definition. * test/openssl/test_config.rb: added tests for Config#clone. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> * ext/openssl/ossl_config.c, ext/openssl/lib/openssl/config.rb, ext/openssl/lib/openssl.rb: reimplement OpenSSL::Config in Ruby. Now it should work on windows. * test/openssl/test_config.rb: added tests for OpenSSL::Config#dup. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> create mode 100644 ext/openssl/lib/openssl/config.rb create mode 100644 test/openssl/test_config.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Fri, 2 Jul 2010 14:35:10 +0000 usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>shyouhei
merge revision(s) 28525:28568: * file.c (ruby_find_basename, ruby_find_extname): split from rb_file_s_basename() and rb_file_s_extname(). * util.c (ruby_add_suffix): support arbitrary length of the suffix to get rid of the potential buffer overflow. reported by tarui. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> merge from trunk (r28565) * file.c (ruby_find_basename): set correct baselen. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> merge from trunk (r28565) * file.c (ruby_find_basename): set correct baselen. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Wed, 23 Jun 2010 12:48:31 +0000 kosaki ↵shyouhei
<kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 28404,28595,28597: * configure.in: avoid getcontext() overhead if possible. [ruby-core:27380][Bug #2553] Thanks, Joe Damato, Dan Peterson and Patrick Mohr. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> * configure.in: fix use_context condition inversion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> Fix changelog of revision 28595 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-22Tue, 12 Jan 2010 21:54:47 +0000 nobu ↵shyouhei
<nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> merge revision(s) 26311 * configure.in: check for if struct timezone is defined. * missing.h (struct timezone): define if not defined. * win32/win32.h (struct timezone): defined in the newer w32api. [ruby-core:27515] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-08-16merge revision(s) 29002:shyouhei
* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error): Fix for possible cross-site scripting (CVE-2010-0541). Found by Apple, reported by Hideki Yamane. Patch by Hirokazu Nishio <nishio.hirokazu AT gmail.com>. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-08-16merge revision(s) 28997:shyouhei
* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error): Fix for possible cross-site scripting (CVE-2010-0541). Found by Apple, reported by Hideki Yamane. Patch by Hirokazu Nishio <nishio.hirokazu AT gmail.com>. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-07-17patchlevel++shyouhei
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-07-17* 2010-07-17svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-07-17 * configure.in: Change AC_PREREQ from 2.58 to 2.60 becausekosaki
AC_CASE macro require 2.60 or later. Thanks, Mitsuru SHIMAMURA. [Bug #3579] [ruby-dev:41856] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-23merge revision(s) 28387:shyouhei
* test/optparse/test_summary.rb: fixed superclass so that it run solely. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-23merge revision(s) 25230:25229:shyouhei
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-21merge revision(s) 26836:26859,26861,27921:shyouhei
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_{get,set}_time{,out}): fixed a bug introduced by backporting. (see [ruby-dev:40573]) use long in according to OpenSSL API. (SSL_SESSION_{get,set}_time{,out}) * ext/openssl/ossl_x509name.c: added X509::Name#hash_old as a wrapper for X509_NAME_hash_old in OpenSSL 1.0.0. * test/openssl/test_x509name.rb (test_hash): make test pass with OpenSSL 1.0.0. * test/openssl/test_x509*: make tests pass with OpenSSL 1.0.0b5. * PKey::PKey#verify raises an exception when a given PKey does not match with signature. * PKey::DSA#sign accepts SHA1, SHA256 other than DSS1. * backport the commit from trunk: Sun Feb 28 11:49:35 2010 NARUSE, Yui <naruse@ruby-lang.org> * openssl/ossl.c (OSSL_IMPL_SK2ARY): for OpenSSL 1.0. patched by Jeroen van Meeuwen at [ruby-core:25210] fixed by Nobuyoshi Nakada [ruby-core:25238], Hongli Lai [ruby-core:27417], and Motohiro KOSAKI [ruby-core:28063] * ext/openssl/ossl_ssl.c (ossl_ssl_method_tab), (ossl_ssl_cipher_to_ary): constified. * ext/openssl/ossl_pkcs7.c (pkcs7_get_certs, pkcs7_get_crls): split pkcs7_get_certs_or_crls. * test/openssl/test_ec.rb: added test_dsa_sign_asn1_FIPS186_3. dgst is truncated with ec_key.group.order.size after openssl 0.9.8m for FIPS 186-3 compliance. WARNING: ruby-openssl aims to wrap an OpenSSL so when you're using openssl 0.9.8l or earlier version, EC.dsa_sign_asn1 raises OpenSSL::PKey::ECError as before and EC.dsa_verify_asn1 just returns false when you pass dgst longer than expected (no truncation performed). * ext/openssl/ossl_pkey_ec.c: rdoc typo fixed. * ext/openssl/ossl_config.c: defined own IMPLEMENT_LHASH_DOALL_ARG_FN_098 macro according to IMPLEMENT_LHASH_DOALL_ARG_FN in OpenSSL 0.9.8m. OpenSSL 1.0.0beta5 has a slightly different definiton so it could be a temporal workaround for 0.9.8 and 1.0.0 dual support. * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): follows function definition in OpenSSL 1.0.0beta5. PKCS5_PBKDF2_HMAC is from 1.0.0 (0.9.8 only has PKCS5_PBKDF2_HMAC_SHA1) * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_eq): do not use SSL_SESSION_cmp and implement equality func by ousrself. See the comment. * ext/openssl/extconf.rb: check some functions added at OpenSSL 1.0.0. * ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which exists. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-16merge revision(s) 23485:shyouhei
* lib/pathname.rb (Pathname#sub): suppress a warning. [ruby-dev:38488] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-16merge revision(s) 26344,27367:shyouhei
* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}): use inclusive range same as the header representation. * test/webrick/utils.rb (TestWEBrick#start_server): add log for test_filehandler.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-10merge revision(s) 25342:shyouhei
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-10 * lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status::initialize):shyouhei
accept 0 or more arguments. [ruby-core:28692] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-10merge revision(s) 26159:shyouhei
* eval.c (rb_load): initialize orig_func. [ruby-core:27296] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e