archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
ruby/ext/psych/lib
History
nagachika 1dcdd256f7 merge revision(s) r45453,r45455,r45577: [Backport #9798] 
* ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version to
	  libyaml-0.1.6 for CVE-2014-2525.

	* ext/psych/yaml/config.h: ditto.

	* ext/psych/yaml/scanner.c: ditto.

	* ext/psych/yaml/yaml_private.h: ditto.

	* ext/psych/psych.gemspec: update gemspec for psych-2.0.5


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-04 15:45:33 +00:00
..
psych merge revision(s) r45221: [Backport #9798] 2014-05-04 15:40:57 +00:00
psych.rb merge revision(s) r45453,r45455,r45577: [Backport #9798] 2014-05-04 15:45:33 +00:00