diff options
| author | Xinchen Hui <laruence@php.net> | 2012-12-17 14:29:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-12-17 14:29:45 +0800 |
| commit | 05deaf17063b61f035e5602fba29e9d0aa8b3a41 (patch) | |
| tree | 31b8748037c688cae5df5eb8e4ee2e5513c794b0 | |
| parent | 2f7f57a4071a2587698d0e18d89df16e532c5ec0 (diff) | |
| parent | 06739a1b72ce1e7192108f9b313746814912a425 (diff) | |
| download | php-git-05deaf17063b61f035e5602fba29e9d0aa8b3a41.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | ext/mysqli/tests/bug63398.phpt | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/ext/mysqli/tests/bug63398.phpt b/ext/mysqli/tests/bug63398.phpt index f3cd322615..b6e6c2549d 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 |