Put back _ in socket and socket_options to refer correctly to staic variables

diff --git a/tools/scripts/composer/patches/net-smtp-tls-patch.txt b/tools/scripts/composer/patches/net-smtp-tls-patch.txt
index 94c549fd60011a442a5ee0021861dc17410d4dd0..3eb2122b0518c8f2f01e115ffed17728e357c921 100644 (file)
--- a/tools/scripts/composer/patches/net-smtp-tls-patch.txt
+++ b/tools/scripts/composer/patches/net-smtp-tls-patch.txt
@@ -7,8 +7,8 @@ index 28eae8c..8f4e92b 100644
                  return $result;
              }
 -            if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) {
-+            if (isset($this->socket_options['ssl']['crypto_method'])) {
-+                $crypto_method = $this->socket_options['ssl']['crypto_method'];
++            if (isset($this->_socket_options['ssl']['crypto_method'])) {
++                $crypto_method = $this->_socket_options['ssl']['crypto_method'];
 +            } else {
 +                /* STREAM_CRYPTO_METHOD_TLS_ANY_CLIENT constant does not exist
 +                 * and STREAM_CRYPTO_METHOD_SSLv23_CLIENT constant is
@@ -17,7 +17,7 @@ index 28eae8c..8f4e92b 100644
 +                                 | @STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT
 +                                 | @STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
 +            }
-+            if (PEAR::isError($result = $this->socket->enableCrypto(true, $crypto_method))) {
++            if (PEAR::isError($result = $this->_socket->enableCrypto(true, $crypto_method))) {
                  return $result;
              } elseif ($result !== true) {
                  return PEAR::raiseError('STARTTLS failed');