diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-16 12:30:28 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-16 12:30:28 +0000 |
| commit | 073cc5e815fcf5178fe4e515fcde74dc3597adeb (patch) | |
| tree | ff58ba88488fdcbbb385575804206ca82c78fc95 /version.h | |
| parent | 0bdadc5b7e4b77ced3acbf0ff3e436a4b945c9ed (diff) | |
merge revision(s): 53153 and 23405@ruby_1_9_1ruby_2_0_0
* ext/fiddle/handle.c: check tainted string arguments.
Patch provided by tenderlove and nobu.
* test/fiddle/test_handle.rb (class TestHandle): add test for above.
* ext/dl/handle.c (rb_dlhandle_initialize): prohibits DL::dlopen
with a tainted name of library.
Patch by sheepman <sheepman AT sheepman.sakura.ne.jp>.
* ext/dl/handle.c (rb_dlhandle_sym): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@53161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2015-08-18" -#define RUBY_PATCHLEVEL 647 +#define RUBY_RELEASE_DATE "2015-12-16" +#define RUBY_PATCHLEVEL 648 #define RUBY_RELEASE_YEAR 2015 -#define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_MONTH 12 +#define RUBY_RELEASE_DAY 16 #include "ruby/version.h" |