summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-15 06:33:36 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-15 06:33:36 +0000
commit30238f96081e47178237e58f5229850514858fd3 (patch)
tree39568dfe277111b7b4740a048ba9c18e431753fe /version.h
parent3c61aab98b22d5224adad020788f8f656f528f66 (diff)
merge revision(s) 53064: [Backport #11810]
* ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): fix parsing protocol list. The protocol list from OpenSSL is not null-terminated. patched by Kazuki Yamaguchi [Bug #11810] [ruby-core:72082] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@56798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index 1834ed704a..6e2d70de01 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.6"
#define RUBY_RELEASE_DATE "2016-11-15"
-#define RUBY_PATCHLEVEL 395
+#define RUBY_PATCHLEVEL 396
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 11