0
0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 01:52:15 +02:00
Commit Graph

296 Commits

Author SHA1 Message Date
Marcus Bointon
e12407cbe9
Undo BC break introduced in 6.1.2 2020-07-14 20:15:44 +02:00
Marcus Bointon
b3650f9f72
Fix null connection issue introduced in #2060 2020-06-11 17:12:50 +02:00
Marcus Bointon
c2796cb1cb
Merge pull request from GHSA-f7hx-fqxw-rvvj
* Initial fixes, tests, and bump to 6.1.6

* Add CVE number
2020-05-27 14:24:03 +02:00
Marcus Bointon
c1c38e3268
Correct Armenian language code 2020-04-17 09:25:34 +02:00
Marcus Bointon
a8bf068f64
6.1.5 2020-03-14 15:23:48 +01:00
Marcus Bointon
26d77e0783
Changelog 2020-02-24 15:53:01 +01:00
Marcus Bointon
594fbb4182
Don't allow headers to contain breaks, fixes #1984 2020-02-20 12:01:48 +01:00
Marcus Bointon
2b6fcc4036
Changelog 2020-02-17 13:51:51 +01:00
Marcus Bointon
c5e61d0729
6.1.4 2019-12-10 12:17:38 +01:00
Marcus Bointon
30cecf76e4
Changelog 2019-12-10 12:16:20 +01:00
Marcus Bointon
05853dbd44
Changelog 2019-12-09 15:09:56 +01:00
Marcus Bointon
a25ae38e03
6.1.3 2019-11-21 10:37:46 +01:00
Marcus Bointon
2f2233b568
Changelog 2019-11-21 10:36:21 +01:00
Marcus Bointon
506eff4a59
Changelog 2019-11-19 16:08:31 +01:00
Marcus Bointon
5f4fefe008
Changelog 2019-11-18 16:22:41 +01:00
Marcus Bointon
526b1836c9 6.1.2 2019-11-13 20:51:46 +01:00
Marcus Bointon
f39d72ba54 Changelog 2019-10-31 09:33:24 +01:00
Marcus Bointon
ee7c65c781 Changelog 2019-10-23 14:45:48 +02:00
Marcus Bointon
9638812426 Changelog 2019-10-20 20:57:10 +02:00
Marcus Bointon
26bd96350b
6.1.1 2019-09-27 23:33:43 +02:00
Marcus Bointon
69892e4e06
PHPMailer 6.1.0 2019-09-27 19:42:59 +02:00
Marcus Bointon
108d6d3c9f
Changelog 2019-09-26 10:57:14 +02:00
Marcus Bointon
6106c0f29a
Changelog 2019-09-25 09:48:03 +02:00
Marcus Bointon
a4f6fe3879
Changelog 2019-09-24 12:39:14 +02:00
Marcus Bointon
18272f02df
Changelog 2019-09-24 10:32:58 +02:00
Marcus Bointon
b8e6a92d41
Drop PHP 5.5 from CI config as it's no longer supported by Travis-CI 2019-08-02 22:30:58 +02:00
Marcus Bointon
516e073dd6
Changelog 2019-07-30 18:29:02 +02:00
Marcus Bointon
8ea801b479
Update changelog.md
Changelog
2019-06-05 09:32:12 +02:00
Marcus Bointon
b70b6eec07
Changelog 2019-05-24 10:49:48 +02:00
Marcus Bointon
3d71323416
Use ; to separate multiple params in MIME headers, see #1714 & #1705 2019-04-27 18:43:00 +02:00
Marcus Bointon
7cfef991e5
Changelog 2019-04-25 17:32:26 +02:00
Marcus Bointon
0c41a36d45
6.0.7 2019-02-01 16:04:28 +01:00
Marcus Bointon
76e08791ba
6.0.6 2018-11-15 23:37:37 +01:00
Marcus Bointon
a8dce4721d
Changelog 2018-10-02 19:09:29 +02:00
Marcus Bointon
110f577ec4
Changelog 2018-09-30 23:04:41 +02:00
Marcus Bointon
18dbc75792
Changelog 2018-09-26 19:40:58 +02:00
Marcus Bointon
ebd510037b
Changelog 2018-08-24 16:46:57 +02:00
Marcus Bointon
cb3ea134d4
6.0.5 2018-03-27 15:49:45 +02:00
Marcus Bointon
3050a4ae75
6.0.4 2018-03-27 11:55:57 +02:00
Marcus Bointon
54ab7a754d
Changelog 2018-03-27 11:54:12 +02:00
Marcus Bointon
63e2c71ea1
Changelog 2018-01-15 15:04:43 +01:00
Marcus Bointon
da9fede584
Changelog 2018-01-11 00:29:45 +01:00
Marcus Bointon
44d49bab5a
6.0.3 2018-01-05 14:19:58 +01:00
Marcus Bointon
9d9021ebc3
Changelog 2017-12-12 13:58:39 +01:00
Marcus Bointon
7a4459cff6
6.0.2 2017-11-30 18:20:24 +01:00
Marcus Bointon
8a0914cfc2
Changelog 2017-11-17 12:00:51 +01:00
Marcus Bointon
5af110e3e1
Changelog 2017-10-19 09:20:19 +02:00
Marcus Bointon
8b935b2d24
Changelog 2017-10-14 08:25:44 +02:00
Marcus Bointon
c944cc830e
Match SendGrid transaction IDs, trim all IDs, fixes #1193 2017-10-09 15:39:17 +02:00
Marcus Bointon
0605a0e96e
Changelog 2017-10-05 15:44:36 +02:00
Marcus Bointon
617df94ffb
6.0.1 2017-09-14 14:50:11 +02:00
Marcus Bointon
f4a8efadfd
Merge remote-tracking branch 'remotes/origin/5.2-stable' 2017-08-28 18:07:42 +02:00
Remi Collet
31f18d8633 Fix date (#1138) 2017-08-28 17:45:27 +02:00
Marcus Bointon
b91bf9267e
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	VERSION
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2017-08-28 13:36:44 +02:00
Marcus Bointon
2baf20b016
v5.2.25 2017-08-28 13:12:07 +02:00
Marcus Bointon
496e0a7178
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	README.md
#	examples/gmail.phps
#	src/SMTP.php
2017-08-28 12:20:50 +02:00
Marcus Bointon
7a037c1eaa
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	README.md
#	examples/gmail.phps
#	src/SMTP.php
2017-08-28 12:15:27 +02:00
Marcus Bointon
f4d37028af
Merge branch '6.0' into 6.0-ical
# Conflicts:
#	changelog.md
2017-08-24 13:51:06 +02:00
Marcus Bointon
b296b18656
Changelog 2017-08-11 14:53:57 +02:00
Marcus Bointon
c205d94136
Changelog 2017-08-11 14:52:39 +02:00
Marcus Bointon
33a6286b7b
Changelog 2017-08-11 14:48:43 +02:00
Marcus Bointon
1e3f4e4062
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	VERSION
#	changelog.md
#	examples/code_generator.phps
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
#	test/phpmailerTest.php
2017-07-26 23:10:42 +02:00
Marcus Bointon
22d04c6a58
5.2.24 2017-07-26 23:00:20 +02:00
Marcus Bointon
424398579d
Merge changes from master 2017-06-22 18:36:56 +02:00
Marcus Bointon
cd2f977899
Allow injecting an SMTP instance 2017-05-29 14:07:11 +02:00
Marcus Bointon
4896adc0a1
Changelog 2017-05-29 08:55:06 +02:00
Marcus Bointon
b25f93eb2d
More reliable folding of message headers 2017-05-22 18:53:00 +02:00
Marcus Bointon
cee3af5c29
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	changelog.md
2017-05-20 23:45:01 +02:00
Marcus Bointon
5e172d2f59
Changelog 2017-05-20 23:35:46 +02:00
Marcus Bointon
e194b97409
Changelog 2017-05-15 10:01:49 +02:00
Marcus Bointon
1f9a66492a
Replace all uses of MD5 and SHA1 with SHA256
Use more secure method of generating IDs
2017-05-11 18:41:34 +02:00
Marcus Bointon
d798b197ed
Incorporate file-reading changes from #500
Update changelog
2017-05-11 01:56:57 +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
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
f52d3759ba
Changelog 2017-03-13 12:19:56 +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
02332a843f
Attempt solution to line break issue, see #953 2017-02-13 23:55:05 +01:00
Marcus Bointon
2963f2b294
Merge branch 'master' into 6.0
# Conflicts:
#	examples/scripts/XRegExp.js
#	extras/htmlfilter.php
2017-01-09 11:18:14 +01:00
Marcus Bointon
f97b9cd3c2
Update notes 2017-01-09 11:15:21 +01:00
Marcus Bointon
84c24bf257
Add CVE-2017-5223 references 2017-01-09 10:32:40 +01:00
Marcus Bointon
8914ec7a4b
Merge branch 'master' into 6.0
# Conflicts:
#	VERSION
#	examples/contentsutf8.html
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
#	test/bootstrap.php
2017-01-06 23:34:57 +01:00
Marcus Bointon
5d88839afc
5.2.22 2017-01-06 22:35:54 +01:00
Marcus Bointon
38fdcb6ef5
Note about VERP addressing when using mail() 2017-01-05 10:34:00 +01:00
Marcus Bointon
789e0846ab
Merge branch 'master' into 6.0
# Conflicts:
#	VERSION
#	extras/htmlfilter.php
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
#	test/phpmailerTest.php
2016-12-29 14:01:45 +01:00
Marcus Bointon
1d51856b76
v5.2.21
Fix missed version number update
2016-12-28 16:35:48 +01:00
Marcus Bointon
8d68507d7b
Minor cleanup, fix 2016-12-28 13:17:21 +01:00
Marcus Bointon
9e4b8fb3de
Minor cleanup, fixes #918, broken version file
Remove duplicate check for Sender address
2016-12-26 11:09:10 +01:00
Marcus Bointon
ed4e7ce8ad
Remove broken check 2016-12-24 16:43:41 +01:00
Marcus Bointon
0f1cb846cc
5.2.18 2016-12-24 15:21:45 +01:00
Marcus Bointon
e0fefda64b
5.2.18 2016-12-24 01:06:31 +01:00
Marcus Bointon
d0c1d1abbd
5.2.18 2016-12-24 00:49:54 +01:00
Marcus Bointon
9727777f27
Name constants consistently
Remove unnecessary POP3 properties
Merge branch 'master' into 6.0

# Conflicts:
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2016-12-09 13:05:38 +01:00
Marcus Bointon
e52f61a070
Name constants consistently
Remove unnecessary POP3 properties
Merge branch 'master' into 6.0

# Conflicts:
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2016-12-09 13:04:56 +01:00
Marcus Bointon
f475467ee3
5.2.17 release 2016-12-09 11:03:27 +01:00
Marcus Bointon
da1b2fc389
Document dropping examples folder in zip 2016-10-17 19:00:18 +02:00