summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2017-05-23 14:50:41 -0700
committerMark Spruiell <mes@zeroc.com>2017-05-23 14:50:41 -0700
commit1051b39b4b5fb0c64338ccee9b3d138b58c9cf6a (patch)
tree912900e8e7d834d370f650af179d46c4e0df6dd9
parentFixed build Windows error introducted with IceSSL fix (diff)
downloadice-1051b39b4b5fb0c64338ccee9b3d138b58c9cf6a.tar.bz2
ice-1051b39b4b5fb0c64338ccee9b3d138b58c9cf6a.tar.xz
ice-1051b39b4b5fb0c64338ccee9b3d138b58c9cf6a.zip
Ruby bug fix for IceSSL::ConnectionInfo
-rw-r--r--CHANGELOG-3.7.md3
-rw-r--r--ruby/src/IceRuby/Connection.cpp6
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG-3.7.md b/CHANGELOG-3.7.md
index 6c8ad2192f7..09aa10c8da7 100644
--- a/CHANGELOG-3.7.md
+++ b/CHANGELOG-3.7.md
@@ -17,6 +17,7 @@ particular aspect of Ice.
- [Objective-C Changes](#objective-c-changes)
- [PHP Changes](#php-changes)
- [Python Changes](#python-changes)
+ - [Ruby Changes](#ruby-changes)
# Changes in Ice 3.7.0
@@ -545,3 +546,5 @@ These are the changes since the Ice 3.6 release or snapshot described in
- Ice for Ruby is no longer supported on Windows.
- Fix Application Ctrl-C handling to be compatible with Ruby 2.x signal handler restrictions.
+
+- Fixed a bug that prevented the data members of IceSSL::ConnectionInfo from being defined correctly.
diff --git a/ruby/src/IceRuby/Connection.cpp b/ruby/src/IceRuby/Connection.cpp
index 03e872ea8fb..a4f0f8bcbff 100644
--- a/ruby/src/IceRuby/Connection.cpp
+++ b/ruby/src/IceRuby/Connection.cpp
@@ -508,7 +508,7 @@ IceRuby::initConnection(VALUE iceModule)
//
// Instance members.
//
- rb_define_attr(_wsConnectionInfoClass, "cipher", 1, 0);
- rb_define_attr(_wsConnectionInfoClass, "certs", 1, 0);
- rb_define_attr(_wsConnectionInfoClass, "verified", 1, 0);
+ rb_define_attr(_sslConnectionInfoClass, "cipher", 1, 0);
+ rb_define_attr(_sslConnectionInfoClass, "certs", 1, 0);
+ rb_define_attr(_sslConnectionInfoClass, "verified", 1, 0);
}