Commit: 06739a1b72ce1e7192108f9b313746814912a425 Author: Xinchen Hui <larue...@php.net> Mon, 17 Dec 2012 14:29:13 +0800 Parents: d2cc09704951d8746d06decf95ea981426b8278b Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=06739a1b72ce1e7192108f9b313746814912a425 Log: dos2unix & skip on connect fail Changed paths: M ext/mysqli/tests/bug63398.phpt Diff: diff --git a/ext/mysqli/tests/bug63398.phpt b/ext/mysqli/tests/bug63398.phpt index f3cd322..b6e6c25 100644 --- a/ext/mysqli/tests/bug63398.phpt +++ b/ext/mysqli/tests/bug63398.phpt @@ -1,35 +1,36 @@ ---TEST-- -Bug #63398 (Segfault when polling closed link) ---SKIPIF-- -<?php -require_once('skipif.inc'); -require_once("connect.inc"); -if (!$IS_MYSQLND) { - die("skip mysqlnd only test"); -} -?> ---FILE-- -<?php +--TEST-- +Bug #63398 (Segfault when polling closed link) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once("connect.inc"); +if (!$IS_MYSQLND) { + die("skip mysqlnd only test"); +} +require_once('skipifconnectfailure.inc'); +?> +--FILE-- +<?php require 'connect.inc'; $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); - -mysqli_close($link); - -$read = $error = $reject = array(); -$read[] = $error[] = $reject[] = $link; - -mysqli_poll($read, $error, $reject, 1); - -echo "okey"; -?> ---EXPECTF-- -Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d - -Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d - -Warning: mysqli_poll(): No stream arrays were passed in %sbug63398.php on line %d - -Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d - -Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d -okey + +mysqli_close($link); + +$read = $error = $reject = array(); +$read[] = $error[] = $reject[] = $link; + +mysqli_poll($read, $error, $reject, 1); + +echo "okey"; +?> +--EXPECTF-- +Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d + +Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d + +Warning: mysqli_poll(): No stream arrays were passed in %sbug63398.php on line %d + +Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d + +Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d +okey -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
