Commit Graph

1201 Commits

Author SHA1 Message Date
Marcus Bointon b6598a155f
Merge remote-tracking branch 'origin/6.0' into 6.0 2017-05-11 01:57:45 +02:00
Marcus Bointon d798b197ed
Incorporate file-reading changes from #500
Update changelog
2017-05-11 01:56:57 +02:00
lewa 7280a55d58 low-level SMTP error handling from 6.0 branch (#1012) (#1041) 2017-05-11 00:27:15 +01:00
Elan Ruusamäe afb1302611 composer: indicate ctype ext being used (#937) 2017-05-11 00:25:01 +01:00
Kirill Voronov a3b4f6b281 add specific chars for matching of ipv6 addresses (#1040)
when validating servers in the `Host` property.
2017-05-11 00:22:50 +01:00
Fabio Beneditto 4f6255858f Update pt_BR translation (#1038)
Adjust on strings: correct sender (remetente, not rementente)
2017-05-07 18:32:26 +01:00
Marcus Bointon 4826199276 Merge remote-tracking branch 'upstream/master' 2017-04-18 17:47:46 +02:00
Marcus Bointon f42de0d01b Add issue_template 2017-04-18 17:47:32 +02:00
Marcus Bointon 819beca5ab Name issue template correctly 2017-04-18 17:45:29 +02:00
Marcus Bointon c33a3a7824
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	examples/gmail_xoauth.phps
#	src/PHPMailer.php
2017-04-13 12:31:40 +02:00
Marcus Bointon 9a0e074e10
Changelog 2017-04-13 12:24:19 +02:00
Marcus Bointon 349350bc71
Changelog 2017-04-13 12:23:28 +02:00
Marcus Bointon 21f1f3f151
Merge remote-tracking branch 'remotes/origin/master' into 5.2-stable 2017-04-13 12:20:47 +02:00
rsdifu 42c7591bb5 Date header should be more dynamic (#1023)
When a message is sent, unless the MessageDate is explicitly set, the Date header should always be set to the current rfcDate() value.

This is necessary for long-running processes that create a single PHPMailer instance, so all emails sent during the lifetime of the process don't have the same Date header value of the first email sent from the process.

This is important because Gmail in particular, uses the Date header value to show how long ago an email was sent when viewing the email.  (The list view in Gmail, however, uses the Received header value to show when an email was sent.)

These differing times will lead to confusion for users, often resulting in them trying to do several things like updating their timezone in Google's settings, or on their computers, which would result in no resolution.
2017-04-09 08:25:43 +02:00
Haci Murat Yaman 1f974d0ab3 updated misleading comment on sample for smtp/google via xoauth2 #890 (#1019)
* updated misleading comment on sample code for smtp.google.com via xoauth2

* undo change on gitignore
2017-04-03 19:25:48 +02:00
Marcus Bointon 6525e86940
Handle bare codes (an RFC contravention) in SMTP replies, fixes #1017 2017-03-30 15:08:20 +02:00
Marcus Bointon 799ff351ca
Trap low-level SMTP errors, see #1012 2017-03-23 12:37:23 +01:00
Marcus Bointon 863e531de8
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	.travis.yml
#	VERSION
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2017-03-16 15:35:18 +01:00
Marcus Bointon 7115df4a6f
5.5.23 2017-03-15 20:32:56 +01:00
Marcus Bointon d306fbdc9f
Move install step to install section 2017-03-15 20:04:43 +01:00
Marcus Bointon 936eaa7770
Downgrade packages for BC with PHP 5.5 tests 2017-03-15 19:49:11 +01:00
Marcus Bointon 8f58d8d494
Travis tweaks, don't update packages on test 2017-03-15 19:06:51 +01:00
Marcus Bointon bf03eda8f6
Package downgrades to run tests on PHP 5.3 2017-03-15 15:13:09 +01:00
Marcus Bointon 9e87d05c5a
Downgrade packages for BC with PHP 5.3 tests 2017-03-15 15:07:10 +01:00
Marcus Bointon c385749c11
Downgrade packages for BC with PHP 5.3 tests 2017-03-15 14:55:19 +01:00
Marcus Bointon d1c84f18a0
Downgrade packages for BC with PHP 5.3 tests 2017-03-15 14:35:08 +01:00
Marcus Bointon 2ceafa2e84
Downgrade packages for BC with PHP 5.3 tests 2017-03-15 14:05:43 +01:00
Marcus Bointon 042ea958cb
Downgrade Zend packages for BC with PHP 5.3 tests 2017-03-15 12:56:46 +01:00
Marcus Bointon 993b100afd
Ensure composer packages are installed 2017-03-15 12:34:39 +01:00
Marcus Bointon ca9ced078c
Fix phpunit path 2017-03-15 12:22:28 +01:00
Marcus Bointon adeb6bdd25
Fix phpunit path 2017-03-15 12:17:05 +01:00
Marcus Bointon aabe7fc692
Restore deleted line 2017-03-15 11:57:56 +01:00
Marcus Bointon c9a06f1558
Fix phpunit path 2017-03-15 11:51:40 +01:00
Marcus Bointon b50ac0d2dc
Use phpunit from composer, not travis default 2017-03-14 18:49:37 +01:00
Marcus Bointon f52d3759ba
Changelog 2017-03-13 12:19:56 +01:00
Marcus Bointon 290c5c1aa4
Merge remote-tracking branch 'remotes/origin/master' into 6.0 2017-03-13 12:15:26 +01:00
Ramon van Belzen 70da1b419d composer: phpunit 4.8 (#940)
switch from 4.7 to 4.8 (latest stable) of phpunit
2017-03-06 23:05:44 +01:00
Marcus Bointon 9f99f8aec1
Merge branch 'master' into 6.0
# Conflicts:
#	src/SMTP.php
2017-03-06 19:16:11 +01:00
Marcus Bointon 09728b0649
Formatting 2017-03-06 16:45:19 +01:00
Marcus Bointon c100b092df
Trap TLS errors 2017-03-06 16:37:58 +01:00
Marcus Bointon c3aba6d974
Test suite now works on HHVM on Travis-CI 2017-03-02 16:09:45 +01:00
Marcus Bointon e302e17092
Test suite now works on HHVM on Travis-CI 2017-03-02 15:31:12 +01:00
Marcus Bointon 5b831f7ae7
Avoid HHVM problem with .ini location 2017-03-02 15:01:03 +01:00
Marcus Bointon e599277376
Merge remote-tracking branch 'origin/master' 2017-03-01 18:49:29 +01:00
Marcus Bointon 4eaed21a6e
Avoid HHVM problem with file:// URL 2017-03-01 18:49:09 +01:00
Marcus Bointon 86af82ceb9
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	extras/htmlfilter.php
2017-03-01 17:54:21 +01:00
Marcus Bointon 9c3ba23563
Generate a warning when using a buggy PHP version, see #953 2017-02-28 11:46:22 +01:00
Marcus Bointon 24b4351a7b
Add `ics` MIME type mapping, see #175 2017-02-21 14:54:19 +01:00
Marcus Bointon bb5ca4329b
Clean up 2017-02-14 19:24:45 +01:00
Marcus Bointon 1e267b66a6
Avoid possibility of line length being too short to trigger test if LE is 1 char 2017-02-14 13:46:50 +01:00