Merge remote-tracking branch 'origin/main' into win32-stack

cpp/test/Ice/binding/Client.cpp

@@ -17,7 +17,10 @@ class Client : public Test::TestHelper
 void
 Client::run(int argc, char** argv)
 {
-    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    // Speed-up connection establishment failure on Windows.
+    properties->setProperty("Ice.Connection.Client.ConnectTimeout", "1");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     void allTests(Test::TestHelper*);
     allTests(this);
 }

js/src/Ice/OutgoingConnectionFactory.js

@@ -239,13 +239,8 @@ export class OutgoingConnectionFactory {
                 this._connectionOptions,
             );
         } catch (ex) {
-            if (ex instanceof LocalException) {
-                try {
-                    transceiver.close();
-                } catch (exc) {
-                    // Ignore
-                }
-            }
+            Debug.assert(ex instanceof LocalException);
+            transceiver.close();
             throw ex;
         }
 

js/src/Ice/TcpTransceiver.js

@@ -118,7 +118,8 @@ if (typeof net.createConnection === "function") {
 
         close() {
             if (this._fd === null) {
-                Debug.assert(this._exception); // Socket creation failed.
+                // Socket creation failed or not yet initialized, the later can happen if the connection creation throws
+                // before calling transceiver initialize.
                 return;
             }
 

js/src/Ice/WSTransceiver.js

@@ -102,7 +102,8 @@ if (typeof WebSocket !== "undefined") {
 
         close() {
             if (this._fd === null) {
-                Debug.assert(this._exception); // Websocket creation failed.
+                // Socket creation failed or not yet initialized, the later can happen if the connection creation throws
+                // before calling transceiver initialize.
                 return;
             }
 
@@ -122,7 +123,6 @@ if (typeof WebSocket !== "undefined") {
                 return;
             }
 
-            Debug.assert(this._fd !== null);
             try {
                 this._state = StateClosed;
                 this._fd.close();

php/test/Ice/slicing/objects/Client.php

@@ -408,7 +408,10 @@ function allTests($helper)
         $d1->pb = null;
         $d1->pd1 = null;
         $b1->pb = null;
-        $p1->pd1 = null;
+        if($p1 instanceof Test\D3)
+        {
+            $p1->pd3 = null;
+        }
     }
     echo "ok\n";