svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/mysql_pdo_test.inc branches/PHP_5_4/ext/pdo_mysql/tests/mysql_pdo_test.inc
trunk/ext/pdo_mysql/tests/mysql_pdo_test.inc
| From: | Ulf Wendel | Date: | Tue, 26 Jul 2011 09:30:49 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/mysql_pdo_test.inc branches/PHP_5_4/ext/pdo_mysql/tests/mysql_pdo_test.inc trunk/ext/pdo_mysql/tests/mysql_pdo_test.inc |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65607@lists.php.net to get a copy of this message | ||
uw Tue, 26 Jul 2011 09:30:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313701
Log:
Fix mysqlnd detection
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/mysql_pdo_test.inc
U php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/mysql_pdo_test.inc
U php/php-src/trunk/ext/pdo_mysql/tests/mysql_pdo_test.inc
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/mysql_pdo_test.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/mysql_pdo_test.inc 2011-07-26 09:27:53 UTC (rev
313700)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/mysql_pdo_test.inc 2011-07-26 09:30:49 UTC (rev
313701)
@@ -155,6 +155,7 @@
phpinfo();
$tmp = ob_get_contents();
ob_end_clean();
+ $tmp = stristr($tmp, "PDO Driver for MySQL => enabled");
return (bool)preg_match('/Client API version.*mysqlnd/', $tmp);
}
Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/mysql_pdo_test.inc
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/mysql_pdo_test.inc 2011-07-26 09:27:53 UTC (rev
313700)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/mysql_pdo_test.inc 2011-07-26 09:30:49 UTC (rev
313701)
@@ -155,6 +155,7 @@
phpinfo();
$tmp = ob_get_contents();
ob_end_clean();
+ $tmp = stristr($tmp, "PDO Driver for MySQL => enabled");
return (bool)preg_match('/Client API version.*mysqlnd/', $tmp);
}
Modified: php/php-src/trunk/ext/pdo_mysql/tests/mysql_pdo_test.inc
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/tests/mysql_pdo_test.inc 2011-07-26 09:27:53 UTC (rev 313700)
+++ php/php-src/trunk/ext/pdo_mysql/tests/mysql_pdo_test.inc 2011-07-26 09:30:49 UTC (rev 313701)
@@ -155,6 +155,7 @@
phpinfo();
$tmp = ob_get_contents();
ob_end_clean();
+ $tmp = stristr($tmp, "PDO Driver for MySQL => enabled");
return (bool)preg_match('/Client API version.*mysqlnd/', $tmp);
}