265b73e6ff
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Conflicts:
ext/standard/mail.c
2015-06-29 00:31:56 -07:00
8f2e08239f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-28 20:23:00 -07:00
cd9c39d77c
Merge branch 'pull-request/1350' into PHP-5.4
...
* pull-request/1350:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-28 20:18:56 -07:00
dacea3f6fb
Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-19 12:19:12 +09:00
d4407e1cb9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add NEWS
Fixed bug #68776
fix test
update NEWS
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
Conflicts:
ext/dom/document.c
ext/gd/gd.c
ext/standard/exec.c
2015-06-09 21:39:59 -07:00
e10af61862
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #68776
2015-06-09 21:33:38 -07:00
9d168b863e
Fixed bug #68776
2015-06-09 21:32:54 -07:00
3483cc2cf6
ensure there is no connection
2015-03-03 17:19:16 +01:00
dcb944b352
avoid skipif as this indeed should be tested
...
plus do expect regex .*
2015-03-03 17:19:14 +01:00
ddd9411f04
windows only test
2015-03-01 13:02:44 +01:00
49d19f6c7c
Fixed test?
2015-02-28 22:35:55 +08:00
30830bcefd
Fixed bug #69115 crash in mail
...
There were two issues
- php_pcre_replace could be used directly and sbject_str could be NULL
- the Windows sendmail variant was freeing something passed from the outside
2015-02-27 10:42:20 +01:00
d022c8565d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test case title
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
2014-02-28 22:30:21 +08:00
eca13f7909
Fixed test case title
2014-02-28 22:27:32 +08:00
79b3c2a744
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
...
A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().
The scenario in which custom headers are used was already fixed in #48620 , back in 2009.
2014-02-28 22:22:07 +08:00
32a4cc8353
Use 'user@example.com' rather than 'user@company.com' in tests
...
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
2013-12-04 07:49:16 -08:00
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
371372714d
Add unit test for mail.log ini setting.
2013-01-06 15:04:27 +01:00
16a592b13a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:52:38 +02:00
4aac4da673
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:34:33 +02:00
1c83f5e04c
fix tests
2011-08-01 03:42:02 +00:00
592daf8453
Fix for bug #51604 (newline in end of header is shown in start of message).
...
Patch by Daniel Egeberg.
2010-04-22 02:22:49 +00:00
c6e8a8957b
Fix for bug #51604 (newline in end of header is shown in start of message).
...
Patch by Daniel Egeberg.
2010-04-22 02:22:49 +00:00
dd38619aa5
Explicitly set mail.add_x_header in php.ini so test output matches expected results
2010-02-02 22:54:36 +00:00
38cdb16dd2
Fixed tests which fail from time to time because of race conditions ("echo" command didn't wait for all the data php tried to send and as result php got a SIGPIPE)
2009-09-22 14:52:47 +00:00
5ca166b1d2
FIx test after Stas' explode() fix
2009-08-14 01:42:11 +00:00
73b9d33ab7
MFH: fix test
2009-04-30 13:22:13 +00:00
a4a08dd43d
MFH:fix test
2009-04-30 13:19:31 +00:00
af4b7aca6e
fix test
2009-04-15 20:54:52 +00:00
1f4f3e269a
Increased the sleep() from 1 to 5 to prevent intermittent failures
2009-02-17 15:16:45 +00:00
237d0378e7
exit -1 and exit -2 don't work for all sh. changed to exit 1
2009-02-16 13:16:50 +00:00
09ac5971f5
MFH use example.com
2009-01-25 23:26:45 +00:00
f94acf2a27
added some mail tests. Tested on windows, linux and linux 64bit
2009-01-23 17:12:08 +00:00
Stanislav Malyshev