projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix from Dimitar Pashev to make sure the rfc822 from adres isn't mixed up
[squirrelmail.git]
/
class
/
deliver
/
Deliver_SMTP.class.php
diff --git
a/class/deliver/Deliver_SMTP.class.php
b/class/deliver/Deliver_SMTP.class.php
index 6461d77212a98858b90b55c78bcfb7e564be4674..e565ca8442c5d1abab95e4f3cf80776af102a40d 100644
(file)
--- a/
class/deliver/Deliver_SMTP.class.php
+++ b/
class/deliver/Deliver_SMTP.class.php
@@
-82,6
+82,10
@@
class Deliver_SMTP extends Deliver {
$content_type->type1 == 'report' &&
isset($content_type->properties['report-type']) &&
$content_type->properties['report-type']=='disposition-notification') {
$content_type->type1 == 'report' &&
isset($content_type->properties['report-type']) &&
$content_type->properties['report-type']=='disposition-notification') {
+ // reinitialize the from object because otherwise the from header somehow
+ // is affected. This $from var is used for smtp command MAIL FROM which
+ // is not the same as what we put in the rfc822 header.
+ $from = new AddressStructure();
$from->host = '';
$from->mailbox = '';
}
$from->host = '';
$from->mailbox = '';
}
@@
-152,7
+156,7
@@
class Deliver_SMTP extends Deliver {
* Implementing SMTP STARTTLS (rfc2487) in php 5.1.0+
* http://www.php.net/stream-socket-enable-crypto
*/
* Implementing SMTP STARTTLS (rfc2487) in php 5.1.0+
* http://www.php.net/stream-socket-enable-crypto
*/
- if ($use_smtp_tls == 2) {
+ if ($use_smtp_tls ==
=
2) {
if (function_exists('stream_socket_enable_crypto')) {
// don't try starting tls, when client thinks that it is already active
if ($this->tls_enabled) {
if (function_exists('stream_socket_enable_crypto')) {
// don't try starting tls, when client thinks that it is already active
if ($this->tls_enabled) {
@@
-511,4
+515,4
@@
class Deliver_SMTP extends Deliver {
}
}
}
}
-?>
\ No newline at end of file
+?>