Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Webslice
ISPConfig 3
Commits
faff70ca
Commit
faff70ca
authored
Jul 05, 2019
by
Till Brehm
Browse files
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
parents
c31703b8
3d4127ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/lib/classes/ispcmail.inc.php
View file @
faff70ca
...
...
@@ -599,10 +599,16 @@ class ispcmail {
fputs
(
$this
->
_smtp_conn
,
'STARTTLS'
.
$this
->
_crlf
);
fgets
(
$this
->
_smtp_conn
,
515
);
$crypto_method
=
STREAM_CRYPTO_METHOD_TLS_CLIENT
;
if
(
defined
(
'STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT'
))
{
$crypto_method
|=
STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
;
$crypto_method
|=
STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT
;
}
stream_context_set_option
(
$this
->
_smtp_conn
,
'ssl'
,
'verify_host'
,
false
);
stream_context_set_option
(
$this
->
_smtp_conn
,
'ssl'
,
'verify_peer'
,
false
);
stream_context_set_option
(
$this
->
_smtp_conn
,
'ssl'
,
'allow_self_signed'
,
true
);
stream_socket_enable_crypto
(
$this
->
_smtp_conn
,
true
,
STREAM_CRYPTO_METHOD_TLS_CLIENT
);
stream_socket_enable_crypto
(
$this
->
_smtp_conn
,
true
,
$crypto_method
);
}
//AUTH LOGIN
...
...
server/lib/classes/ispcmail.inc.php
View file @
faff70ca
...
...
@@ -598,7 +598,13 @@ class ispcmail {
if
(
$this
->
smtp_crypt
==
'tls'
)
{
fputs
(
$this
->
_smtp_conn
,
'STARTTLS'
.
$this
->
_crlf
);
fgets
(
$this
->
_smtp_conn
,
515
);
stream_socket_enable_crypto
(
$this
->
_smtp_conn
,
true
,
STREAM_CRYPTO_METHOD_TLS_CLIENT
);
$crypto_method
=
STREAM_CRYPTO_METHOD_TLS_CLIENT
;
if
(
defined
(
'STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT'
))
{
$crypto_method
|=
STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
;
$crypto_method
|=
STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT
;
}
stream_socket_enable_crypto
(
$this
->
_smtp_conn
,
true
,
$crypto_method
);
}
//AUTH LOGIN
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment