[thrift] branch master updated: THRIFT-5132 Warning in TSocket when using ssl connection Client: PHP Patch: Vladimir Panivko

[jensg]

This is an automated email from the ASF dual-hosted git repository.

jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new 0503fc0  THRIFT-5132 Warning in TSocket when using ssl connection 
Client: PHP Patch: Vladimir Panivko
0503fc0 is described below

commit 0503fc0112728bd17d9b5163716265c2a879404f
Author: panivko <vladimir.pani...@together.com>
AuthorDate: Fri May 29 08:17:16 2020 +0300

    THRIFT-5132 Warning in TSocket when using ssl connection
    Client: PHP
    Patch: Vladimir Panivko
    
    This closes #2160
---
 lib/php/lib/Transport/TSocket.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/php/lib/Transport/TSocket.php 
b/lib/php/lib/Transport/TSocket.php
index 374037a..8fe60fd 100644
--- a/lib/php/lib/Transport/TSocket.php
+++ b/lib/php/lib/Transport/TSocket.php
@@ -251,8 +251,9 @@ class TSocket extends TTransport
         }
 
         if (function_exists('socket_import_stream') && 
function_exists('socket_set_option')) {
-            $socket = socket_import_stream($this->handle_);
-            socket_set_option($socket, SOL_TCP, TCP_NODELAY, 1);
+            // warnings silenced due to bug 
https://bugs.php.net/bug.php?id=70939
+            $socket = @socket_import_stream($this->handle_);
+            @socket_set_option($socket, SOL_TCP, TCP_NODELAY, 1);
         }
     }