summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-16add tag v1_8_7_302v1_8_7_302shyouhei
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_7_302@29007 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
2010-06-08 * win32/Makefile.sub (config.status): no need to embbed manifest if not exist.shyouhei
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 28193:shyouhei
* include/ruby/win32.h: include errno.h before defining errnos. * include/ruby/win32.h: check definition existance before defining errno macros. * win32/win32.c (errmap): define winsock errors mappings. these are VC++10 support, merge from trunk (r27236, r27258). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 28192:shyouhei
* regexp.c (re_compile_pattern): allow zero times match for non-greedy range repeatation. [ruby-core:30613] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 28144:shyouhei
* configure.in: should replace COMMON_HEADERS if --with-winsock2 is specified. [ruby-dev:41521] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27983:shyouhei
* io.c, eval.c, process.c: remove all condition of r26371. now, all platform use the same way. [Bug #3278][ruby-core:30167] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27799:27805:shyouhei
* ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments. a patch by Masaya TARUI <tarui AT prx.jp>. * ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if errno is not set. [ruby-dev:41317] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27721:27725,27738:27740:shyouhei
* pack.c: backport integer pack/unpack from 1.9 for [ruby-core:21937]. * configure.in: backport RUBY_DEFINT and fixed size integer checks. * ruby.h: include stdint.h if available. * bignum.c (rb_big_pack): defined.. (rb_big_unpack): defined. * intern.h (rb_big_pack): declared. (rb_big_unpack): declared. * pack.c (pack_pack): call rb_quad_pack to preserve RangeError. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27720:shyouhei
* regex.c (read_special): get rid of overrun. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27688:shyouhei
* lib/net/imap.rb: backported exception handling from trunk. [ruby-core:29745] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27665:shyouhei
* ext/bigdecimal/bigdecimal.c (VpAlloc): ensure buf does not get collected. based on a patch masaya tarui at [ruby-dev:41213]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27547:shyouhei
* lib/thwait.rb (ThreadsWait#join): refined rdoc again. [ruby-core:29863] [ruby-dev:41092] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27490:shyouhei
* lib/net/imap.rb (fetch_internal): do not quote message data item names. Thanks, Eric Hodel. [ruby-core:23508] backported form trunk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27487:shyouhei
* lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo Matsuyama. [ruby-dev:38063] backported from trunk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27459:shyouhei
* ext/win32ole/win32ole.c (ole_val2variant): fix the core dump when converting Array object to VT_ARRAY variant. [ruby-core:28446] [Bug #2836] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27404:shyouhei
* file.c (rb_file_s_extname): skip last directory separators. [ruby-core:29627] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27400:shyouhei
* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are destroyed otherwise. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27398:shyouhei
* eval.c (search_required): expand home relative path first. [ruby-core:29610] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27394:27397:shyouhei
* lib/timeout.rb (Timeout#timeout): propagate errors to the caller. [ruby-dev:41010]' git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27374,27512:shyouhei
* lib/net/smtp.rb (Net::SMTP#rcptto_list): continue when at least one RCPT is accepted. based on a patch from Kero van Gelder at [ruby-core:26190]. * lib/net/smtp.rb (Net::SMTP#rcptto_list): fixed typo. [ruby-core:29809] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27321:shyouhei
* LEGAL: separated the section for parse.c. contributed by Paul Betteridge in [ruby-core:29472]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27087:shyouhei
* ext/rational/lib/rational.rb: fix [Bug #1397]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 27014:shyouhei
* lib/date.rb (Date#>>): fixed. [ruby-core:28011] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-08merge revision(s) 26371,26373,26374,26972:shyouhei
* eval.c (thread_timer, rb_thread_stop_timer): check the timing of stopping timer. patch from KOSAKI Motohiro <kosaki.motohiro _AT_ jp.fujitsu.com> * eval.c (rb_thread_start_timer): NetBSD5 seems to be hung when calling pthread_create() from pthread_atfork()'s parent handler. * io.c (pipe_open): workaround for NetBSD5. stop timer thread before fork(), and start it if needed. * process.c (rb_f_fork, rb_f_system): ditto. fixed [ruby-dev:40074] jp.fujitsu.com> via IRC. fork(), and restart it after fork() on parent, and on child if needed. these changes are tested by naruse. fixed [ruby-dev:40074] * io.c, eval.c, process.c: add linux to r26371's condition. patched by Motohiro KOSAKI [ruby-core:28151] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-07merge revision(s) 26903:shyouhei
* ext/nkf/nkf-utf8/nkf.c (numchar_getc): get rid of buffer overflow. [ruby-dev:40606] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-06-07merge revision(s) 26850: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}) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-24merge revision(s) 26835:shyouhei
* ext/openssl: backport fixes in 1.9. * r25019 by marcandre * ossl_ocsp.c (ossl_ocspres_to_der): Bug fix in Response#to_def. Patch by Chris Chandler [ruby-core:18411] * r25017 by marcandre * ossl_config.c (ossl_config_add_value_m, ossl_config_set_section): Check if frozen (or untrusted for $SECURE >= 4) [ruby-core:18377] * r22925 by nobu * ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks. [ruby-core:22860] * ext/openssl/ossl_engine.c (ossl_engine_s_by_id): suppress a warning. * ext/openssl/ossl_ssl.c (ossl_sslctx_flush_sessions): time_t may be larger than long. * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_get_time), (ossl_ssl_session_get_timeout): use TIMET2NUM() to convert time_t. * r22924 by nobu * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use OPENSSL_free instead of free. a patch from Charlie Savage at [ruby-core:22858]. * r22918 by akr * ext/openssl: suppress warnings. * ext/openssl/ossl.h (OSSL_Debug): don't use gcc extention for variadic macro. * r22666 by akr * ext/openssl/lib/openssl/buffering.rb: define Buffering module under OpenSSL. [ruby-dev:37906] * r22440 by nobu * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify returns positive value on success, not non-zero. [ruby-core:21762] * r22378 by akr * ext/openssl: avoid cyclic require. * ext/openssl/lib/openssl/ssl-internal.rb: renamed from ssl.rb * ext/openssl/lib/openssl/x509-internal.rb: renamed from x509.rb. [ruby-dev:38018] * r22101 by nobu * ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): used conditionally. * r21510 by akr * ext/openssl/ossl.c (ossl_raise): abolish a warning. * r21208 by akr * ext/openssl/ossl_digest.c (GetDigestPtr): use StringValueCStr instead of STR2CSTR. * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto. (ossl_ec_group_initialize): ditto. * r19420 by mame * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_to_string): comment out fragments of unused code. * r18975 by nobu * ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): fix for initialization of r18168. * r18971 by nobu * ext/openssl/ossl_config.c (Init_ossl_config): removed C99ism. * r18944 by matz * ext/openssl/ossl_config.c (Init_ossl_config): memory leak fixed. a patch <shinichiro.hamaji at gmail.com> in [ruby-dev:35880]. * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto. * r18917 by nobu * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): fix for initialization of r18168. * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): ditto. * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto. * r18283 by nobu * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): suppress warnings on platforms which int size differs from pointer size. * r18181 by nobu * ext/openssl/openssl_missing.h (d2i_of_void): define for older versions. [ruby-dev:35637] * r18168 by nobu * ext/openssl: suppress warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-22merge revision(s) 26750:shyouhei
* lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg. (Resolv::DNS::Requester#request): raise ResolvTimeout consistently for timeout. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-22merge revision(s) 26712:shyouhei
* ext/readline/readline.c (Init_readline): initialize check rl_catch_signals and rl_catch_sigwinch. [ruby-core:28238] [ruby-core:28242] * ext/readline/extconf.rb: check rl_catch_signals and rl_catch_sigwinch. * ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb: [ruby-core:25702] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-22 * test/net/http/test_connection.rb ↵shyouhei
(TestHTTP::HTTPConnectionTest#test_connection_refused_in_request): Wrong exception to assert. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-22merge revision(s) 26645:shyouhei
* io.c (rb_io_modenum_mode): return "r" for O_RDONLY|O_APPEND. [ruby-dev:40379] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-22merge revision(s) 26636:26638:shyouhei
* lib/resolv.rb: fix [ruby-core:28144] reported by Hans de Graaff. (Resolv::DNS#make_requester): pass nameserver_port to UnconnectedUDP.new. (Resolv::DNS.bind_random_port): change the is_ipv6 argument to bind_host. (Resolv::DNS::Requester#initialize): change instance variable to store multiple sockets. (Resolv::DNS::Requester#request): pass readable sockets to recv_reply. (Resolv::DNS::Requester#close): close all sockets. (Resolv::DNS::Requester::UnconnectedUDP#initialize): allocate a socket for each address family of name servers. (Resolv::DNS::Requester::UnconnectedUDP#recv_reply): read from the passwd readable socket. (Resolv::DNS::Requester::UnconnectedUDP#sender): use appropriate socket for the target nameserver. (Resolv::DNS::Requester::ConnectedUDP): follow the instance variable change. (Resolv::DNS::Requester::TCP#sender): ditto. (Resolv::DNS::Config#nameserver_port): new method. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-22merge revision(s) 26553:shyouhei
* lib/net/http.rb (Net::HTTP#request): close @socket only after started. [ruby-core:28028] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-22merge revision(s) 26534:26536:shyouhei
* eval.c (proc_invoke): reverted r25975. [ruby-dev:39931] [ruby-dev:40059] * eval.c (rb_mod_define_method): return original block but not bound block. [ruby-core:26984] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-20merge revision(s) 26346:shyouhei
* lib/webrick/httpservlet/filehandler.rb (make_partial_content): add bytes-unit. [ruby-dev:40030] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-20merge revision(s) 26326:shyouhei
* ext/zlib/zlib.c: backport r18029 and r21861 from trunk. * r18029 ext/zlib/zlib.c (rb_deflate_params): flush before deflateParams. [ruby-core:17675] (by mame) * r21861 ext/zlib/zlib.c (zstream_run): desperately guard the variable. [ruby-core:20576] (by usa) * test/zlib/test_zlib.rb: backport deflate tests from trunk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-20merge revision(s) 26307:shyouhei
* lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb: accept any time format in maker. [ruby-core:26923] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 14:26:34 +0000