Commit Graph

1201 Commits

Author SHA1 Message Date
Marcus Bointon ec5661e699
More test feedback 2017-02-14 12:14:19 +01:00
Marcus Bointon 16a060be1a
More test feedback 2017-02-14 01:32:41 +01:00
Marcus Bointon 8e8da27e3d
Fix tests 2017-02-14 00:16:25 +01:00
Marcus Bointon 02332a843f
Attempt solution to line break issue, see #953 2017-02-13 23:55:05 +01:00
Marcus Bointon d5d811570b
Update deps 2017-02-13 23:54:22 +01:00
Chris Brown 8dc31573d2 Convert use of each() to foreach() for performance (#984)
and also to avoid triggering deprecation alerts in PHP 7.2
2017-02-01 22:48:00 +01:00
Jakub Kalousek e94e6477e7 Added missing translation (#975) 2017-01-26 17:44:48 +01:00
Marcus Bointon 7d42f12f1b
Improve upgrade docs, see #959 2017-01-12 19:51:55 +01:00
Marcus Bointon 016cb3395c
Fix INCLUDE_DIR 2017-01-09 12:19:12 +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 b18cb98131
Merge remote-tracking branch 'origin/master' 2017-01-09 10:33:47 +01:00
Marcus Bointon 84c24bf257
Add CVE-2017-5223 references 2017-01-09 10:32:40 +01:00
Marcus Bointon 96c5d32386
Extend line break tests 2017-01-09 10:19:14 +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 e9705c17fa
Remove LE property - if you need to change it, override the LE constant instead 2017-01-06 22:50:12 +01:00
Marcus Bointon 5d88839afc
5.2.22 2017-01-06 22:35:54 +01:00
Marcus Bointon ad4cb09682
More careful checking of paths in msgHTML 2017-01-06 22:35:37 +01:00
Marcus Bointon 48e8cac067
Improve msgHTML tests 2017-01-06 22:30:55 +01:00
Marcus Bointon d1a7de4e94
Make test bootstrap a bit more flexible 2017-01-06 22:27:49 +01:00
Marcus Bointon 6349f4cf06
Emoji in test content 2017-01-05 17:53:20 +01:00
Marcus Bointon a39c742bd7
Example cleanup 2017-01-05 13:06:20 +01:00
Marcus Bointon c6713cdbe2
Add simple contact form example 2017-01-05 13:05:53 +01:00
Marcus Bointon 38fdcb6ef5
Note about VERP addressing when using mail() 2017-01-05 10:34:00 +01:00
ka7 fa04e02c9a spelling fixes (#949) 2017-01-03 12:10: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 8147a61efa
Array -> array, mentioned in #927 2016-12-29 10:34:25 +01:00
Marcus Bointon 1d51856b76
v5.2.21
Fix missed version number update
2016-12-28 16:35:48 +01:00
hrvoj3e 388f8a4585 Version mismatch PHPMailer->Version = '5.2.20'; (#933)
Trying to patch CVE-2016-10045 and it is confusing to have version mismatch.
2016-12-28 16:27:40 +01:00
sikander efde5edb3d Fixed link to Security (#931) 2016-12-28 14:36:42 +01:00
Marcus Bointon d73f836c27
Cleanup 2016-12-28 14:14:27 +01:00
Marcus Bointon 06aae8b651
Merge PR #930 from @Zanaxer 2016-12-28 13:28:04 +01:00
Marcus Bointon 8d68507d7b
Minor cleanup, fix 2016-12-28 13:17:21 +01:00
Paul Buonopane 833c35fe39
CVE-2016-10033, CVE-2016-10045: More patches, stricter anti-escaping 2016-12-28 06:30:43 -05:00
Paul Buonopane 9743ff5c7e Fix for CVE-2016-10045 and CVE-2016-10033 (#929)
* Fix for CVE-2016-10045 and CVE-2016-10033

* CVE-2016-10033: Also check escapeshellarg
2016-12-28 11:11:08 +01:00
Marcus Bointon 70d041b6f5
Fix security links 2016-12-27 17:44:01 +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 dbbbf49d61
Unbreak tests 2016-12-24 15:26:34 +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 4835657cd6
Check that sendmail path exists before trying to use it
Validate Sender address
Consistent use of empty()
2016-12-24 00:40:05 +01:00
Marcus Bointon 5f87e21af3
Update security notes
# Conflicts:
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2016-12-24 00:07:36 +01:00
Marcus Bointon d0d08185ab
Merge remote-tracking branch 'origin/master'
# Conflicts:
#	SECURITY.md
2016-12-23 23:58:10 +01:00
Marcus Bointon e1de2b822b
Update security notes
# Conflicts:
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2016-12-23 23:56:40 +01:00
Jakub Kramarz c700f9868d Fixed vulnerability link in SECURITY.md (#902) 2016-12-16 16:48:55 +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 208913c604
Merge remote-tracking branch 'origin/master' 2016-12-09 11:03:48 +01:00