@@ -92,7 +92,6 @@ public function connect(string $host, ?int $port = null, array $options = []): v
92
92
$ this ->newParser ($ this ->stream )
93
93
);
94
94
95
- // If we're using STARTTLS, we first connect plain and then upgrade the connection.
96
95
$ this ->stream ->open (
97
96
$ transport === 'starttls ' ? 'tcp ' : $ transport ,
98
97
$ host ,
@@ -123,8 +122,13 @@ protected function getDefaultSocketOptions(string $transport, array $proxy = [],
123
122
{
124
123
$ options = [];
125
124
125
+ $ key = match ($ transport ) {
126
+ 'ssl ' , 'tls ' => 'ssl ' ,
127
+ 'tcp ' => 'tcp ' ,
128
+ };
129
+
126
130
if (in_array ($ transport , ['ssl ' , 'tls ' ])) {
127
- $ options [' ssl ' ] = [
131
+ $ options [$ key ] = [
128
132
'verify_peer ' => $ validateCert ,
129
133
'verify_peer_name ' => $ validateCert ,
130
134
];
@@ -134,13 +138,13 @@ protected function getDefaultSocketOptions(string $transport, array $proxy = [],
134
138
return $ options ;
135
139
}
136
140
137
- $ options [$ transport ]['proxy ' ] = $ proxy ['socket ' ];
138
- $ options [$ transport ]['request_fulluri ' ] = $ proxy ['request_fulluri ' ] ?? false ;
141
+ $ options [$ key ]['proxy ' ] = $ proxy ['socket ' ];
142
+ $ options [$ key ]['request_fulluri ' ] = $ proxy ['request_fulluri ' ] ?? false ;
139
143
140
144
if (isset ($ proxy ['username ' ])) {
141
145
$ auth = base64_encode ($ proxy ['username ' ].': ' .$ proxy ['password ' ]);
142
146
143
- $ options [$ transport ]['header ' ] = ["Proxy-Authorization: Basic $ auth " ];
147
+ $ options [$ key ]['header ' ] = ["Proxy-Authorization: Basic $ auth " ];
144
148
}
145
149
146
150
return $ options ;
0 commit comments