summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ficken <mattficken@php.net>2012-05-25 10:34:33 +0200
committerAnatoliy Belsky <ab@php.net>2012-05-25 10:34:33 +0200
commit4aac4da6739a87bf481fdd653b420dc5ca56b3ed (patch)
tree7a33af88ca27518b6b7156ca344b94638f29728a
parentd4d36fba28a215a1f49cecf354668c010bf7a24e (diff)
downloadphp-git-4aac4da6739a87bf481fdd653b420dc5ca56b3ed.tar.gz
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
-rw-r--r--ext/standard/tests/mail/mail_skipif.inc10
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/standard/tests/mail/mail_skipif.inc b/ext/standard/tests/mail/mail_skipif.inc
index 2f4fbf3d6f..006594021d 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}';