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

1287 Commits

Author SHA1 Message Date
Marcus Bointon
1c43605340
Remove obsolete comments, fixes #79 2017-08-28 12:09:07 +02:00
Marcus Bointon
2579038ad7
Merge remote-tracking branch 'origin/6.0' into 6.0 2017-08-24 13:54:11 +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
a3c4191626 Fix regex 2017-08-16 10:57:35 +02:00
Marcus Bointon
a314ab7a89 Add MS ESMTP message id capture 2017-08-16 10:40:55 +02:00
ashickurnoor
5ce90b1962 league/oauth2-google is require (#1126)
league/oauth2-google is require to send mail. By Adding league/oauth2-google into composer.json it will download required library. 

https://github.com/PHPMailer/PHPMailer/blob/master/composer.json#L47
2017-08-12 17:59:58 +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
1fa545d67a
Merge remote-tracking branch 'origin/master' 2017-08-11 14:49:00 +02:00
Marcus Bointon
33a6286b7b
Changelog 2017-08-11 14:48:43 +02:00
Marcus Bointon
de9a30df63
Fix obtaining transaction ID when keepalive is active, fixes #1123 2017-08-11 14:46:32 +02:00
Marcus Bointon
3f80e2dc92
Fix obtaining transaction ID when keepalive is active, fixes #1123 2017-08-11 13:55:51 +02:00
Niklas
ccdeae108a IMAP section in the Gmail example (#1117)
Add IMAP example into gmail example
2017-08-02 16:20:32 +02:00
Marcus Bointon
18263000c5
Support Ical in alt_attach MIME structure, see #175 2017-08-01 18:01:32 +02:00
Marcus Bointon
c6e65069ad
Prefer pre-decrement 2017-07-28 10:55:10 +02:00
Marcus Bointon
a8728150fd
Don't echo & concat, use , 2017-07-28 10:54:10 +02:00
Marcus Bointon
a4fdea1590
Combine echo & exit 2017-07-28 10:48:35 +02:00
Marcus Bointon
01264ebf31
Take function call out of loop 2017-07-28 10:46:56 +02:00
Marcus Bointon
3eb9e8b47a
Don't try to output possibly non-existent elements 2017-07-27 00:00:46 +02:00
Marcus Bointon
ca9f6c2d57
Avoid XSS in error message output 2017-07-26 23:16:08 +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
4f6449ecfa
Add fix for IPv6 literals in multiple host strings, see #1094 2017-07-26 22:52:29 +02:00
Marcus Bointon
cb2be11013
Add failing test for #1094
Exercise more bad host checks
2017-07-26 22:51:02 +02:00
Marcus Bointon
1194d56e92
Correct Serbian ISO language code from sr to rs 2017-07-26 22:09:06 +02:00
Marcus Bointon
d46ba2d186
Fix potential XSS vuln in debug output 2017-07-26 20:03:27 +02:00
Marcus Bointon
dbbc1397c4
Fix XSS vuln in example code: CVE-2017-11503 2017-07-26 20:02:31 +02:00
Marcus Bointon
c899ba203f
Remove code generator example - too messy! 2017-07-26 19:54:31 +02:00
Marcus Bointon
6bf4b5a187
Consistent alternative regex delimiter 2017-07-26 11:05:43 +02:00
Marcus Bointon
c64609ad07
Comment cleanup 2017-07-26 11:05:10 +02:00
Marcus Bointon
84717cdd4e
Don't need this doc 2017-07-26 11:04:20 +02:00
Marcus Bointon
9e4f68b6b0 Restrict zend_i18n to PHP 5.5 compat version 2017-06-29 21:55:28 +02:00
Marcus Bointon
d8880934f5 No empty parens on new 2017-06-29 21:54:47 +02:00
Marcus Bointon
589b09fce5 Remove trailing commas 2017-06-29 21:54:09 +02:00
Marcus Bointon
1f6c876d5e Avoid old aliases
Use short array syntax
2017-06-29 20:52:54 +02:00
Marcus Bointon
6d7c66df9e Return value directly 2017-06-29 20:42:22 +02:00
Marcus Bointon
97e95ab154 Avoid embedded assignment 2017-06-29 20:21:35 +02:00
Marcus Bointon
6121caf09a Remove common alternatives 2017-06-29 20:14:11 +02:00
Marcus Bointon
9ed764ecbf Prefer pre-increment 2017-06-29 19:57:38 +02:00
Marcus Bointon
618f998286 Prefer short operators 2017-06-29 19:56:19 +02:00
Marcus Bointon
48dd88a70e Remove unnecessary parens 2017-06-29 19:49:19 +02:00
Marcus Bointon
9111e36438 Avoid embedded assignment 2017-06-29 19:39:06 +02:00
Marcus Bointon
94e1d25572 Avoid embedded assignment 2017-06-29 19:36:06 +02:00
Marcus Bointon
4125778dd9 Call validate statically 2017-06-29 19:15:53 +02:00
Marcus Bointon
f12f42009a
Merge remote-tracking branch 'origin/6.0' into 6.0 2017-06-23 10:29:14 +02:00
Marcus Bointon
cf868cd588
Upgrade dev deps 2017-06-22 18:50:04 +02:00
Marcus Bointon
424398579d
Merge changes from master 2017-06-22 18:36:56 +02:00
Marcus Bointon
c35694d65f
Merge remote-tracking branch 'origin/master' 2017-06-21 14:00:22 +02:00
Marcus Bointon
ffb6be138d
Add dates in history 2017-06-21 14:00:05 +02:00
Marcus Bointon
f26ca5279e Remove v5 issue_template 2017-06-14 14:53:33 +02:00