[PHP-CVS] 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

[Ulf Wendel]

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);
        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php