Commit: 4aac4da6739a87bf481fdd653b420dc5ca56b3ed Author: Matt Ficken <mattfic...@php.net> Fri, 25 May 2012 10:34:33 +0200 Committer: Anatoliy Belsky <a...@php.net> Fri, 25 May 2012 10:34:33 +0200 Parents: d4d36fba28a215a1f49cecf354668c010bf7a24e Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4aac4da6739a87bf481fdd653b420dc5ca56b3ed Log: Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build Bugs: https://bugs.php.net/62148 Changed paths: M ext/standard/tests/mail/mail_skipif.inc Diff: diff --git a/ext/standard/tests/mail/mail_skipif.inc b/ext/standard/tests/mail/mail_skipif.inc index 2f4fbf3..0065940 100644 --- a/ext/standard/tests/mail/mail_skipif.inc +++ b/ext/standard/tests/mail/mail_skipif.inc @@ -1,5 +1,15 @@ <?php extension_loaded('imap') or die('skip imap extension not available in this build'); + +if( substr(PHP_OS, 0, 3) == 'WIN' && extension_loaded('sockets')) { + // be sure mail server is accessible... on PHP 5.3.13 release build, using test-pack PHP-5.3-r1af8b3f, + // the code below didn't skip test even though there was no mail server + // test then failed (no mail server to test against) + $socket = socket_create(AF_INET, SOCK_RAW, 1); + socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, array('sec' => 10, 'usec' => 10)); + // imap uses tcp port 143 + socket_connect($socket, "localhost", 143) or die ("skip can't socket to mail server"); +} // Change these to make tests run successfully $mailbox = '{localhost}'; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
