archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 33201,33249,33328: [Backport #5564]

Browse source 
* encoding.c (load_encoding): predefined encoding names are safe.
	  [ruby-dev:44469] [Bug #5279]

	* transcode.c (load_transcoder_entry): ditto.

	* encoding.c (require_enc): reject only loading from untrusted
	  load paths.  [ruby-dev:44541] [Bug #5279]

	* transcode.c (load_transcoder_entry): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-02-08 00:40:44 +00:00
parent 911e4ee15a
commit b7f40d86af
5 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 50
#define RUBY_PATCHLEVEL 51
#define RUBY_RELEASE_DATE "2012-02-07"
#define RUBY_RELEASE_DATE "2012-02-08"
#define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 7
#define RUBY_RELEASE_DAY 8
#include "ruby/version.h"