Commit graph

4661 commits

Author SHA1 Message Date
nagachika
a653ba0a4c merge revision(s) 42720: [Backport #8829]
* ext/zlib/zlib.c (zstream_run):  Fix handling of deflate streams that
	  need a dictionary but are being decompressed by Zlib::Inflate.inflate
	  (which has no option to set a dictionary).  Now Zlib::NeedDict is
	  raised instead of crashing.  [ruby-trunk - Bug #8829]

	* test/zlib/test_zlib.rb (TestZlibInflate):  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-29 12:55:11 +00:00
nagachika
335a9ef2f8 merge revision(s) 42100: [Backport #8806]
* ext/date/date_parse.c (rfc2822_cb): check if wday is given, since it
	  can be omitted.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-22 16:19:07 +00:00
nagai
317effe374 * ext/tk/extconf.rb: Default search_versions are set 8.5 and 8.4 only. At present, Tcl/Tk8.6 is not supported.
* ext/tk/extconf.rb: Fix typo. [ruby-core:56084] [Bug #8656]
* ext/tk/extconf.rb: Don't add "-ltk -ltcl" for MacOSX frameworks, because they may link improper libraries.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-04 01:30:46 +00:00
nagachika
5be2e8eb39 merge revision(s) 40080,40081: [Backport #8209]
* ext/extmk.rb (extmake): Use Logging.open to switch stdout and
	  stderr.  Delay Logging::log_close until the failure message is
	  written.  Write the failure message only if log file is opened.

	* lib/mkmf.rb (Logging.log_opened?): New method.
	  [ruby-dev:47215] [Bug #8209]

	* ext/extmk.rb (extmake): Invoke Logging::log_close in a ensure
	  clause.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-03 14:08:18 +00:00
nagachika
0f1fb6ff36 merge revision(s) 42126: [Backport #8664]
* ext/openssl/ossl_asn1.c (asn1time_to_time):  Implement YYMMDDhhmmZ
	  format for ASN.1 UTCTime.  [ruby-trunk - Bug #8664]

	* test/openssl/test_asn1.rb:  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-28 12:49:00 +00:00
nagachika
e931e27add merge revision(s) 41077,41105: [Backport #8485] [Backport #8500] [Backport #8578]
* ext/date/date_core.c: fixed a bug [ruby-core:55295].  reported
	  by Riley Lynch.

	* ext/date/date_core.c: fixed coding error [ruby-core:55337].
	  reported by Riley Lynch.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:52:27 +00:00
nagachika
ad22d67e2b merge revision(s) 41871: [Backport #8608]
* ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:47:56 +00:00
nagachika
ce75312a67 merge revision(s) 41862:
fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:36:33 +00:00
nagachika
239d52c825 merge revision(s) 41805: [Backport #8575] [Backport #8582]
* lib/openssl/ssl.rb: Fix SSL client connection crash for SAN marked
	  critical.
	  The patch for CVE-2013-4073 caused SSL crash when a SSL server returns
	  the certificate that has critical SAN value.  X509 extension could
	  include 2 or 3 elements in it:
	  [id, criticality, octet_string] if critical,
	  [id, octet_string] if not.
	  Making sure to pick the last element of X509 extension and use it as
	  SAN value.
	  [ruby-core:55685] [Bug #8575]
	  Thank you @nahi for providing the patch!


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-06 17:05:08 +00:00
nagachika
b4359a3a43 merge revision(s) 41785:
Fix comment typo by @parroty [fix GH-350]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-06 16:52:56 +00:00
nagachika
157dd91713 merge revision(s) 41623,41723: [Backport #6862] [Backport #8587]
* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix for the cases when
	  the argument x is not a BigDecimal.
	  This change is based on the patch made by Garth Snyder.
	  [Fix GH-332] https://github.com/ruby/ruby/pull/332
	  This change is based on the patch made by Heesob Park and Garth Snyder.
	  [Bug #6862] [ruby-core:47145]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-01 18:09:58 +00:00
nagachika
8bbcbef83e merge revision(s) 41671:
* ext/openssl/lib/openssl/ssl.rb (verify_certificate_identity): fix
	  hostname verification. Patched by nahi.

	* test/openssl/test_ssl.rb (test_verify_certificate_identity): test for
	  above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-27 11:11:11 +00:00
nagachika
2d3482ac74 merge revision(s) 41558: [Backport #8561]
* ext/etc/etc.c (etc_getpwnam): use PRIsVALUE in format string instead
	  of %s and RSTRING_PTR

	* ext/etc/etc.c (etc_getgrnam): ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-22 15:05:31 +00:00
nagachika
e4fd9de96d merge revision(s) 41347: [Backport #5048] [Backport #5465] [Backport #8319]
* ext/tk/extconf.rb: support s390x (Thanks to bkabrda) [ruby-trunk - Bug #5465]
	* ext/tk/extconf.rb: apply [Backport87 - Backport #5048]
	* ext/tk/lib/tk/canvas.rb, ext/tk/sample/demos-{en,jp}/{tree.rb,widget}: fix bug (Thanks to zzak) [ruby-trunk - Bug #8319]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-17 15:38:49 +00:00
nagachika
9fb5a1cdbf merge revision(s) 41266: [Backport #8517]
* ext/socket/extconf.rb:  Enable RFC 3542 IPV6 socket options for OS X
	  10.7+.  [ruby-trunk - Bug #8517]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-15 16:31:06 +00:00
nagachika
cc94db60ba merge revision(s) 41014: [Backport #8467]
* ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc),
	  (gzreader_gets): check EOF.  [ruby-core:55220] [Bug #8467]

	* ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc),
	  (gzreader_gets): check EOF.  [ruby-core:55220] [Bug #8467]

	* lib/cgi/util.rb: All class methods moduleized.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-04 15:44:57 +00:00
nagachika
19f0852363 merge revision(s) 40728:
* ext/dl/lib/dl/func.rb (DL::Function#call): check tainted when
	  $SAFE > 0.

	* ext/fiddle/function.c (function_call): check tainted when $SAFE > 0.

	* test/fiddle/test_func.rb (module Fiddle): add test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-05-14 11:13:40 +00:00
nagachika
8a4fa092e2 merge revision(s) 40435:
Typo by @windwiny [Fixes GH-295]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-24 15:40:25 +00:00
nagachika
1914720cba merge revision(s) 40431:
* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-24 15:38:37 +00:00
nagachika
2bc8289441 merge revision(s) 40117,40118,40333: [Backport #8222]
* test/test_curses.rb: tests for getch.
	* ext/curses/curses.c (Init_curses): fix implementation function,
	  crmode should be same as cbreak.  [ruby-core:54013] [Bug #8222]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 17:39:44 +00:00
nagachika
2e607b7ff3 merge revision(s) 40304: [Backport #8240]
* ext/openssl/ossl_ssl.c: Correct shutdown behavior w.r.t GC.

	* test/openssl/test_ssl.rb: Add tests to verify correct behavior.
	[Bug #8240] Patch provided by Shugo Maeda. Thanks!


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 17:16:37 +00:00
nagachika
b3f5b73ac2 merge revision(s) 40318:
fixed wrong value by @taksatou [fix GH-287]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-16 13:49:52 +00:00
nagachika
36eb336678 revert r40311(merge revision(s) 40117,40118).
It breaks rubyci tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 16:27:33 +00:00
nagachika
d9aa81ea3e merge revision(s) 40117,40118: [Backport #8222]
* test/test_curses.rb: tests for getch.
	* ext/curses/curses.c (Init_curses): fix implementation function,
	  crmode should be same as cbreak.  [ruby-core:54013] [Bug #8222]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 14:19:55 +00:00
nagachika
844f78f556 merge revision(s) 39817: [Backport #8116]
* ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.
	  [Bug #8116] [ruby-dev:47177]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 15:22:58 +00:00
nagachika
aa69372cf8 merge revision(s) 40216: [Backport #8266]
* ext/fiddle/closure.c (initialize): check mprotect's return value.
	  If mprotect is failed because of PaX or something, its function call
	  will cause SEGV.
	  20130401T210301Z.diff.html.gz


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 14:47:14 +00:00
nagachika
926d1cbf2f merge revision(s) 40090:
* ext/openssl/ossl_bn.c (ossl_bn_initialize): fix can't create from bn.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-04 15:56:00 +00:00
nagachika
8b5f0528a7 merge revision(s) 39595: [Backport #8014]
* ext/objspace/objspace.c (count_nodes): count also newly added nodes,
	  and fix key for unknown node.  patch by tmm1 (Aman Gupta) in
	  [ruby-core:53130] [Bug #8014]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 16:05:31 +00:00
nagachika
ccb9fb0b26 merge revision(s) 39772,39773: [Backport #8080]
* configure.in: check struct timeval exist or not.

	* include/ruby/missing.h (struct timeval): check HAVE_STRUCT_TIMEVAL
	  properly. and don't include sys/time.h if struct timeval exist.

	* file.c: include sys/time.h explicitly.

	* random.c: ditto.

	* thread_pthread.c: ditto.

	* time.c: ditto.

	* ext/date/date_strftime.c: ditto.

	* include/ruby/missing.h (struct timespec): include <sys/time.h>


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:34:16 +00:00
nagachika
0d946b214b merge revision(s) 39475: [Backport #7868]
* ext/date/date_core.c: [ruby-core:52303]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-09 15:02:03 +00:00
nagachika
e2e5d3fd1e merge revision(s) 39359:
Add test for [Backport #7896] [ruby-core:52607]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-09 12:39:11 +00:00
nagachika
b2a8c2f355 merge revision(s) 39309,39310: [Backport #7551]
* ext/openssl/ossl.c (class OpenSSL):  Fixed ExtensionFactory example.
	  Patch by Richard Bradley.  [ruby-trunk - Bug #7551]

	* ext/openssl/ossl.c (class OpenSSL):  Use only inner parenthesis in
	  create_extension examples.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-04 15:17:27 +00:00
nagachika
7a730fe143 merge revision(s) 39286,39287:
* ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
	  [Github tenderlove/psych#118]
	  [Github tenderlove/psych#127]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-04 14:43:08 +00:00
nobu
5dabe22803 * ext/io/console/io-console.gemspec: bump. [Backport #7891]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-24 07:58:55 +00:00
zzak
5936806c66 * ext/pty/pty.c: Documentation for the PTY module [Backport #7928]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-24 05:04:20 +00:00
mrkn
3ecab2256f merge revision(s) 39321:
* ext/bigdecimal/bigdecimal.gemspec: bump to 1.2.0.
	  [ruby-core:51777] [Bug #7761]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23 03:13:36 +00:00
naruse
b7b9aa6609 merge revision(s) 39208:
* ext/json: merge JSON 1.7.7.
	  This includes security fix. [CVE-2013-0269]
	  d0a62f3ced
	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 06:34:48 +00:00
nobu
98932f5150 eval.c: preserve errinfo
* eval.c (rb_ensure): preserve errinfo accross ensure proc before
  JUMP_TAG().  [ruby-core:52022] [Bug #7802]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 07:09:48 +00:00
tenderlove
1c836f811c * ext/psych/lib/psych/visitors/yaml_tree.rb: fixing string quotation
when dumping Ruby strings. Thanks Ingy

* test/psych/test_psych.rb: appropriate tests.

* test/psych/test_yaml.rb: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-07 23:54:29 +00:00
tenderlove
7a68f53dc6 * ext/psych/lib/psych/visitors/yaml_tree.rb: change output reference
ids to be sequential numbers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-07 23:52:01 +00:00
zzak
90eb265f86 * doc/pty/README: Remove static documentation file
* ext/pty/pty.c: Add License to PTY module overview


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-06 20:51:56 +00:00
zzak
a493ec0388 * doc/pty/README.expect: Removed static documentation file
* ext/pty/lib/expect.rb: Documentation for IO#expect


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-06 14:31:32 +00:00
nobu
490f1fc009 console.c: default by stty raw
* ext/io/console/console.c (rawmode_opt): use default values by `stty
  raw`.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-05 04:27:57 +00:00
zzak
53bc349069 * ext/json/lib/json.rb: Move module overview definition for rdoc
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-04 19:39:15 +00:00
nobu
d06141cde7 io-console.gemspec: 0.4.1
* ext/io/console/io-console.gemspec: bump to 0.4.1.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-04 12:23:51 +00:00
nobu
1a15c3770e io-console.gemspec: limit date length
* ext/io/console/io-console.gemspec: limit Date keyword length to get rid of locale format.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-04 12:15:32 +00:00
nobu
36ed400fe3 io-console.gemspec: update
* ext/io/console/io-console.gemspec: use Date keyword and add licenses.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-04 12:09:16 +00:00
nobu
a9cbe8c721 init.c: declaration-after-statement
* ext/socket/init.c (cloexec_accept): fix declaration-after-statement.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-04 06:19:40 +00:00
nobu
523292d612 console.c: initialize
* ext/io/console/console.c (rawmode_opt): initialize options for the
  case all options are not given.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-04 06:10:12 +00:00
nobu
80455c0d97 * ext/io/console/io-console.gemspec: fix date.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-03 08:22:43 +00:00