[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/ext/pdo/pdo.c branches/PHP_5_3/ext/pdo/pdo.c trunk/ext/pdo/pdo.c

[Felipe Pena]

felipe          Sun, 19 Jul 2009 20:53:26 +0000

URL: http://svn.php.net/viewvc?view=revision&revision=284385
     http://bugs.php.net/48785

Changed paths:
        U   php/php-src/branches/PHP_5_2/ext/pdo/pdo.c
        U   php/php-src/branches/PHP_5_3/ext/pdo/pdo.c
        U   php/php-src/trunk/ext/pdo/pdo.c

Log:
- Fixed module check (Related to bug #48785)



Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo.c  2009-07-19 18:55:31 UTC (rev 
284384)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo.c  2009-07-19 20:53:26 UTC (rev 
284385)
@@ -180,7 +180,7 @@
                        driver->driver_name, driver->api_version, 
PDO_DRIVER_API);
                return FAILURE;
        }
-       if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+       if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
                zend_error(E_ERROR, "You MUST load PDO before loading any PDO 
drivers");
                return FAILURE; /* NOTREACHED */
        }
@@ -191,7 +191,7 @@

 PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
 {
-       if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+       if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
                return;
        }


Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo.c  2009-07-19 18:55:31 UTC (rev 
284384)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo.c  2009-07-19 20:53:26 UTC (rev 
284385)
@@ -185,7 +185,7 @@
                        driver->driver_name, driver->api_version, 
PDO_DRIVER_API);
                return FAILURE;
        }
-       if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+       if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
                zend_error(E_ERROR, "You MUST load PDO before loading any PDO 
drivers");
                return FAILURE; /* NOTREACHED */
        }
@@ -196,7 +196,7 @@

 PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
 {
-       if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+       if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
                return;
        }


Modified: php/php-src/trunk/ext/pdo/pdo.c
===================================================================
--- php/php-src/trunk/ext/pdo/pdo.c     2009-07-19 18:55:31 UTC (rev 284384)
+++ php/php-src/trunk/ext/pdo/pdo.c     2009-07-19 20:53:26 UTC (rev 284385)
@@ -185,7 +185,7 @@
                        driver->driver_name, driver->api_version, 
PDO_DRIVER_API);
                return FAILURE;
        }
-       if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+       if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
                zend_error(E_ERROR, "You MUST load PDO before loading any PDO 
drivers");
                return FAILURE; /* NOTREACHED */
        }
@@ -196,7 +196,7 @@

 PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
 {
-       if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+       if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
                return;
        }



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