zeroc-ice 3.7.7 → 3.7.9

data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.7
+// Ice version 3.7.9
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 7
+#   if ICE_INT_VERSION % 100 < 9
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.7
+// Ice version 3.7.9
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 7
+#   if ICE_INT_VERSION % 100 < 9
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp

@@ -399,10 +399,21 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::
             }
             case SSL_ERROR_SSL:
             {
-                ostringstream ostr;
-                ostr << "SSL error occurred for new " << (_incoming ? "incoming" : "outgoing")
-                     << " connection:\n" << _delegate->toString() << "\n" << _engine->sslErrors();
-                throw ProtocolException(__FILE__, __LINE__, ostr.str());
+#if defined(SSL_R_UNEXPECTED_EOF_WHILE_READING)
+                if (SSL_R_UNEXPECTED_EOF_WHILE_READING == ERR_GET_REASON(ERR_get_error()))
+                {
+                    throw ConnectionLostException(__FILE__, __LINE__, 0);
+                }
+                else
+                {
+#endif
+                    ostringstream ostr;
+                    ostr << "SSL error occurred for new " << (_incoming ? "incoming" : "outgoing")
+                         << " connection:\n" << _delegate->toString() << "\n" << _engine->sslErrors();
+                    throw ProtocolException(__FILE__, __LINE__, ostr.str());
+#if defined(SSL_R_UNEXPECTED_EOF_WHILE_READING)
+                }
+#endif
             }
             }
         }
@@ -748,8 +759,20 @@ OpenSSL::TransceiverI::read(IceInternal::Buffer& buf)
             }
             case SSL_ERROR_SSL:
             {
-                throw ProtocolException(__FILE__, __LINE__,
-                                        "SSL protocol error during read:\n" + _engine->sslErrors());
+#if defined(SSL_R_UNEXPECTED_EOF_WHILE_READING)
+                if (SSL_R_UNEXPECTED_EOF_WHILE_READING == ERR_GET_REASON(ERR_peek_error()))
+                {
+                    ERR_clear_error();
+                    throw ConnectionLostException(__FILE__, __LINE__, 0);
+                }
+                else
+                {
+#endif
+                    throw ProtocolException(__FILE__, __LINE__,
+                                            "SSL protocol error during read:\n" + _engine->sslErrors());
+#if defined(SSL_R_UNEXPECTED_EOF_WHILE_READING)
+                }
+#endif
             }
             }
         }

data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp

@@ -25,6 +25,9 @@
 
 #include <regex.h>
 
+// Disable deprecation warnings from SecureTransport APIs
+#include <IceUtil/DisableWarnings.h>
+
 using namespace std;
 using namespace IceUtil;
 using namespace Ice;

data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp

@@ -12,6 +12,9 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/LocalException.h>
 
+// Disable deprecation warnings from SecureTransport APIs
+#include <IceUtil/DisableWarnings.h>
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;

data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp

@@ -23,6 +23,10 @@ using namespace IceSSL;
 using namespace IceSSL::SecureTransport;
 using namespace std;
 
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 namespace
 {
 

data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp

@@ -34,10 +34,15 @@ IceUtilInternal::int64ToString(Int64 val)
 
 #if defined(_WIN32)
     sprintf_s(buf, sizeof(buf), "%I64d", val);
-#elif defined(ICE_64)
-    sprintf(buf, "%ld", val); // Avoids a format warning from GCC.
+#elif defined(__APPLE__)
+    // sprintf is deprecated with macOS Ventura
+    snprintf(buf, sizeof(buf), "%ld", val); // Avoids a format warning from GCC.
 #else
+#   if defined(ICE_64)
+    sprintf(buf, "%ld", val); // Avoids a format warning from GCC.
+#   else
     sprintf(buf, "%lld", val);
+#   endif
 #endif
     return string(buf);
 }

data/ext/ice/cpp/src/IceUtil/StringConverter.cpp

@@ -2,10 +2,12 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
+// TODO codecvt was deprecated in C++17 and cause build failures in C++17 mode
+// For VC++ we should replace this code with MultiByteToWideChar() and WideCharToMultiByte()
 #if defined(_MSC_VER) && (_MSVC_LANG >= 201703L)
-    // TODO codecvt was deprecated in C++17 and cause build failures with VC++ compiler
-    // we should replace this code with MultiByteToWideChar() and WideCharToMultiByte()
 #   define  _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
+#elif (__cplusplus >= 201703L)
+#   include <IceUtil/DisableWarnings.h>
 #endif
 
 #include <IceUtil/StringConverter.h>

data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp

@@ -1191,11 +1191,11 @@ lookupKwd(const string& name)
     //
     static const string keywordList[] =
     {
-        "alignas", "alignof", "and", "and_eq", "asm", "auto", "bit_and", "bit_or", "bool", "break",
-        "case", "catch", "char", "char16_t", "char32_t", "class", "compl", "const", "const_exptr", "const_cast", "continue",
+        "alignas", "alignof", "and", "and_eq", "asm", "auto", "bitand", "bitor", "bool", "break",
+        "case", "catch", "char", "char16_t", "char32_t", "class", "compl", "const", "const_cast", "constexpr", "continue",
         "decltype", "default", "delete", "do", "double", "dynamic_cast",
         "else", "enum", "explicit", "export", "extern", "false", "float", "for", "friend",
-        "goto", "if", "inline", "int", "long", "mutable", "namespace", "new", "noexcept", "not", "not_eq",
+        "goto", "if", "inline", "int", "long", "mutable", "namespace", "new", "noexcept", "not", "not_eq", "nullptr",
         "operator", "or", "or_eq", "private", "protected", "public", "register", "reinterpret_cast", "requires",
         "return", "short", "signed", "sizeof", "static", "static_assert", "static_cast", "struct", "switch",
         "template", "this", "thread_local", "throw", "true", "try", "typedef", "typeid", "typename",

data/ext/ice/cpp/src/Slice/Grammar.cpp

@@ -104,6 +104,7 @@
 #if defined(__clang__)
 #   pragma clang diagnostic ignored "-Wconversion"
 #   pragma clang diagnostic ignored "-Wsign-conversion"
+#   pragma clang diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
 using namespace std;

data/ext/ice/cpp/src/Slice/MD5I.cpp

@@ -52,6 +52,7 @@
  */
 
 #include <Slice/MD5I.h>
+#include <stdint.h>
 #include <string.h>
 
 #ifdef __GNUC__
@@ -172,7 +173,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
              * On little-endian machines, we can process properly aligned
              * data without copying it.
              */
-            if (!((data - (const md5_byte_t *)0) & 3)) {
+            if (!((reinterpret_cast<uintptr_t>(data)) & 3)) {
                 /* data are properly aligned */
                 X = (const md5_word_t *)data;
             } else {

data/ext/ice/cpp/src/Slice/PythonUtil.cpp

@@ -222,9 +222,45 @@ lookupKwd(const string& name)
     //
     static const string keywordList[] =
     {
-        "None", "and", "assert", "break", "class", "continue", "def", "del", "elif", "else", "except", "exec",
-        "finally", "for", "from", "global", "if", "import", "in", "is", "lambda", "not", "or", "pass",
-        "print", "raise", "return", "self", "try", "while", "yield"
+        "False",
+        "None",
+        "True",
+        "and",
+        "as",
+        "assert",
+        "async",
+        "await",
+        "break",
+        "case",
+        "class",
+        "continue",
+        "def",
+        "del",
+        "elif",
+        "else",
+        "except",
+        "exec",
+        "finally",
+        "for",
+        "from",
+        "global",
+        "if",
+        "import",
+        "in",
+        "is",
+        "lambda",
+        "match",
+        "nonlocal",
+        "not",
+        "or",
+        "pass",
+        "print",
+        "raise",
+        "return",
+        "try",
+        "while",
+        "with",
+        "yield"
     };
     bool found =  binary_search(&keywordList[0],
                                 &keywordList[sizeof(keywordList) / sizeof(*keywordList)],
@@ -805,7 +841,20 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
             TypePtr ret = (*oli)->returnType();
             ParamDeclList paramList = (*oli)->parameters();
             string inParams;
+            string inParamsDecl;
 
+            // Find the last required parameter, all optional parameters after the last required parameter will use
+            // Ice.Unset as the default.
+            ParamDeclPtr lastRequiredParameter;
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
+            {
+                if(!(*q)->isOutParam() && !(*q)->optional())
+                {
+                    lastRequiredParameter = *q;
+                }
+            }
+
+            bool afterLastRequiredParameter = lastRequiredParameter == ICE_NULLPTR;
             for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 if(!(*q)->isOutParam())
@@ -813,17 +862,29 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
                     if(!inParams.empty())
                     {
                         inParams.append(", ");
+                        inParamsDecl.append(", ");
+                    }
+                    string param = fixIdent((*q)->name());
+                    inParams.append(param);
+                    if(afterLastRequiredParameter)
+                    {
+                        param += "=Ice.Unset";
+                    }
+                    inParamsDecl.append(param);
+
+                    if(*q == lastRequiredParameter)
+                    {
+                        afterLastRequiredParameter = true;
                     }
-                    inParams.append(fixIdent((*q)->name()));
                 }
             }
 
             _out << sp;
             writeDocstring(*oli, DocSync, false);
             _out << nl << "def " << fixedOpName << "(self";
-            if(!inParams.empty())
+            if(!inParamsDecl.empty())
             {
-                _out << ", " << inParams;
+                _out << ", " << inParamsDecl;
             }
             const string contextParamName = getEscapedParamName(*oli, "context");
             _out << ", " << contextParamName << "=None):";

data/ice.gemspec

@@ -4,7 +4,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
-  s.version     = '3.7.7'
+  s.version     = '3.7.9'
   s.summary     = "ZeroC Ice for Ruby"
   s.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven

data/lib/Glacier2/Metrics.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifier.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Glacier2/Router.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Glacier2/RouterF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Glacier2/SSLInfo.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Glacier2/Session.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/BuiltinSequences.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Communicator.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/CommunicatorF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Connection.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/ConnectionF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Current.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Endpoint.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/EndpointF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/EndpointTypes.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/FacetMap.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Identity.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/ImplicitContext.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/ImplicitContextF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Instrumentation.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/InstrumentationF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/LocalException.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Locator.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/LocatorF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Logger.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/LoggerF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Metrics.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/ObjectAdapter.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/ObjectAdapterF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/ObjectFactory.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Plugin.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/PluginF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #

data/lib/Ice/Process.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.7
+# Ice version 3.7.9
 #
 # <auto-generated>
 #