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

127 Commits

Author SHA1 Message Date
Marcus
3d4e3b1a0d Years & version numbers 2016-04-07 11:04:03 +02:00
Marcus
33f82ab517 Merge branch 'master' into 5.4
Bump version to 5.5
Clean up code generator
# Conflicts:
#	README.md
#	examples/send_file_upload.phps
#	src/SMTP.php
#	test/phpmailerTest.php
2016-04-07 10:52:37 +02:00
Marcus
27501ac7b9 Merge branch 'master' into 5.4
Bump version to 5.5
Clean up code generator
# Conflicts:
#	README.md
#	examples/send_file_upload.phps
#	src/SMTP.php
#	test/phpmailerTest.php
2016-04-07 10:51:05 +02:00
Marcus
b7151db9b7 Improve Windows compatibility for tests 2016-03-29 15:14:19 +02:00
Marcus
99bf646428 Ignore files created during tests 2016-03-16 10:02:38 +01:00
Synchro
bf60c58a01 Merge branch 'master' into 5.4
# Conflicts:
#	composer.lock
#	get_oauth_token.php
2016-01-07 18:39:55 +01:00
Synchro
9211ba6728 Ensure Message-ID is always valid, fixes #587 2016-01-07 16:28:39 +01:00
Marcus Bointon
32a99356ef Merge remote-tracking branch 'remotes/upstream/master' into 5.4
# Conflicts:
#	test/phpmailerTest.php
2015-12-22 09:35:50 +01:00
Marcus Bointon
ea7bb516f1 Remove personal email address 2015-12-22 09:23:03 +01:00
Synchro
104359d993 Fix extra line break in getSentMIMEMessage(), fixes #589 2015-12-18 13:16:51 +01:00
Synchro
280e7a51f8 Make parseAddresses static, see #82 2015-12-17 17:32:39 +01:00
Synchro
5cdb01b129 Ignore whatever the problem is with pop3 for now! 2015-12-01 15:44:12 +01:00
Synchro
cccf32b7a6 Fix POP3 script path 2015-12-01 14:23:47 +01:00
Synchro
bd4bb1024a Revert to old code for POP tests, ignore exit errors
Update deps
2015-12-01 10:20:44 +01:00
Synchro
2074c8e5ab See what's happening in the shell 2015-11-24 19:04:12 +01:00
Synchro
a7aa1491ef Ps args 2015-11-24 11:56:07 +01:00
Synchro
f8ed4eba2a PHPUnit again 2015-11-23 08:54:21 +01:00
Synchro
da9666e893 PHPUnit tweaks 2015-11-12 14:43:19 +01:00
Synchro
428949a697 PHPUnit tweaks 2015-11-12 12:51:29 +01:00
Synchro
2ea088ecc5 PHPUnit tweaks 2015-11-12 12:30:31 +01:00
Synchro
6a7ed78618 PHPUnit tweaks 2015-11-12 12:18:21 +01:00
Synchro
eaebda7d66 PHPUnit tweaks 2015-11-12 11:47:10 +01:00
Synchro
1f3a204d70 PHPUnit tweaks 2015-11-12 11:29:23 +01:00
Synchro
f66899617a PHPUnit tweaks 2015-11-12 10:45:16 +01:00
Synchro
0c116a6287 PHPUnit tweaks 2015-11-12 10:13:28 +01:00
Synchro
c9f2347300 PHPUnit tweaks 2015-11-12 10:12:55 +01:00
Synchro
545febf0cf PHPUnit tweaks 2015-11-12 09:43:56 +01:00
Synchro
7a55a752b3 PHPUnit tweaks 2015-11-12 09:37:41 +01:00
Synchro
6bcb0f8f8d PHPUnit tweaks 2015-11-12 08:43:23 +01:00
Synchro
2b632a71be PHPUnit tweaks 2015-11-11 19:20:16 +01:00
Synchro
a0407c6630 Travis & PHPUnit tweaks 2015-11-10 19:09:08 +01:00
Synchro
12805da50a Travis & PHPUnit tweaks 2015-11-10 15:17:46 +01:00
Synchro
fbe62ff9b5 Tidy up copyright notices 2015-11-10 14:44:16 +01:00
Synchro
14e8ef03eb Short array syntax 2015-11-10 13:45:13 +01:00
Synchro
9b3e13dc14 First draft of 5.4 2015-11-09 19:09:13 +01:00
Synchro
6687a96a18 Add test for line breaks in addresses vulnerability
Don't allow line breaks in addresses
Don't allow line breaks in SMTP commands
Rearrange tests so slowest tests run last
2015-11-01 11:12:04 +01:00
François B
0fa9518609 Allow addresses with IDN
Accepts Internationalized Domain Name everywhere PHPMailler expects
email addresses (To, CC, BCC, Reply-To, From, Sender and
ConfirmReadingTo).

Requires PHP >= 5.3 with "intl" extension installed and "mbstring"
extension enabled. Earlier versions don't see a change, i.e. specifying
an address with IDN still fails validation.

Follow-up to PR #516. Ran test/phpmailerTest.php

Other changes:

- From, Sender and ConfirmReadingTo addresses are now validated in
send(). Previously, only From and Sender addresses would be validated
only if specified via the setFrom() method. ConfirmReadingTo was never
validated.

- Half language strings for the 'invalid_address' message used colon at
the end and half didn't. Harmonized messages to always include colon,
and not add a second one with PHP code.
2015-10-14 22:02:07 +02:00
François B
4532cec50d Improve some comments and minor improvements
- Define an $error_message and reuse it, instead of recreating the
error message 3 times
- Use in_array() check instead of a regex
2015-10-13 22:38:15 +02:00
Roman Minchyn
870350756b [TASK]
replace "@type" annotation in favor of "@var" as proposed by phpdoc.org

Issue #513
2015-09-28 11:35:42 +02:00
Synchro
c93759dcd1 Fix issues with embedding items without filenames, fixes #478 2015-08-25 12:01:39 +02:00
Synchro
6f266a2e42 Don't normalise line breaks when QP-encoding, fixes #464 2015-08-01 11:32:18 +02:00
Synchro
199bd9698b Add address parser, fixes #82, #145 2015-05-21 17:05:57 +02:00
Synchro
c7e488d64b Add multiple attachment test 2015-05-04 10:59:56 +02:00
Synchro
9164e6d9eb Corrections to ISO text test
Only test ICS configs that are actually supported!
Fix missing headers when using signed messages
2015-04-29 20:46:10 +02:00
Synchro
4e8a80a657 Merge remote-tracking branch 'remotes/upstream/longlines' 2015-04-29 11:31:39 +02:00
Marcus Bointon
89bb0d6094 Fix file attachment test 2015-04-23 19:33:15 +02:00
Joris Berthelot
47fd54d04d Added custom header getter 2015-04-23 19:06:49 +02:00
Synchro
b83f2a6b6b Merge remote-tracking branch 'remotes/upstream/master' into longlines 2015-04-17 15:16:13 +02:00
Synchro
50eac8739f Use multibyte text in tests
Add explicit test for UTF-8 with embedded images, see #279 and #377
Add ISO-8859-1 test
2015-03-25 19:22:55 +01:00
Synchro
a071e68f46 Fix unique id / boundary problems when creating body before header
Add tests for line length transfer encoding override
2015-03-20 20:58:32 +01:00