diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-18 09:53:29 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-18 09:53:29 +0000 |
| commit | d761c9b178d8a2b7757ca5ea41135c7ea37c70b2 (patch) | |
| tree | 2fa288d6bfe10f3c961d9914e7c547666cfe52f3 /version.h | |
| parent | ef73b34c87f52be6a87e0f7ab8d5a03bfcaa983f (diff) | |
merge revision(s) 32605:32610:
* backport r32609 from trunk.
* ext/openssl/ossl_hmac.c: Revert checking return type of
HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0.
* backport r32606 from trunk.
* ext/openssl/ossl_digest.c: Check return value of EVP_DigestInit_ex.
* ext/openssl/ossl_hmac.c: Check return value of HMAC_Init_ex.
Thanks, Jared Jennings, for the patch.
[ Ruby 1.9 - Bug #4944 ] [ruby-core:37670]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@36126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2012-06-10" +#define RUBY_RELEASE_DATE "2012-06-18" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20120610 -#define RUBY_PATCHLEVEL 368 +#define RUBY_RELEASE_CODE 20120618 +#define RUBY_PATCHLEVEL 369 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 18 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |