php_pdo_register_driver() might fail

Therefore correctly report failure in MINIT for the drivers which didn't.

Author: Girgias

ext/pdo/pdo.c

@@ -115,7 +115,7 @@ zend_module_entry pdo_module_entry = {
 ZEND_GET_MODULE(pdo)
 #endif
 
-PDO_API int php_pdo_register_driver(const pdo_driver_t *driver) /* {{{ */
+PDO_API zend_result php_pdo_register_driver(const pdo_driver_t *driver) /* {{{ */
 {
 	if (driver->api_version != PDO_DRIVER_API) {
 		zend_error(E_ERROR, "PDO: driver %s requires PDO API version " ZEND_ULONG_FMT "; this is PDO version %d",

ext/pdo/php_pdo_driver.h

@@ -655,8 +655,9 @@ struct _pdo_row_t {
 	pdo_stmt_t *stmt;
 };
 
-/* call this in MINIT to register your PDO driver */
-PDO_API int php_pdo_register_driver(const pdo_driver_t *driver);
+/* Call this in MINIT to register the PDO driver.
+ * Registering the driver might fail and should be reported accordingly in MINIT. */
+PDO_API zend_result php_pdo_register_driver(const pdo_driver_t *driver);
 /* call this in MSHUTDOWN to unregister your PDO driver */
 PDO_API void php_pdo_unregister_driver(const pdo_driver_t *driver);
 

ext/pdo_firebird/pdo_firebird.c

@@ -58,7 +58,9 @@ PHP_MINIT_FUNCTION(pdo_firebird) /* {{{ */
 	REGISTER_PDO_CLASS_CONST_LONG("FB_ATTR_TIME_FORMAT", (zend_long) PDO_FB_ATTR_TIME_FORMAT);
 	REGISTER_PDO_CLASS_CONST_LONG("FB_ATTR_TIMESTAMP_FORMAT", (zend_long) PDO_FB_ATTR_TIMESTAMP_FORMAT);
 
-	php_pdo_register_driver(&pdo_firebird_driver);
+	if (FAILURE == php_pdo_register_driver(&pdo_firebird_driver)) {
+		return FAILURE;
+	}
 
 #ifdef ZEND_SIGNALS
 	/* firebird replaces some signals at runtime, suppress warnings. */

ext/pdo_oci/pdo_oci.c

@@ -87,7 +87,9 @@ PHP_MINIT_FUNCTION(pdo_oci)
 	REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_MODULE", (zend_long)PDO_OCI_ATTR_MODULE);
 	REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_CALL_TIMEOUT", (zend_long)PDO_OCI_ATTR_CALL_TIMEOUT);
 
-	php_pdo_register_driver(&pdo_oci_driver);
+	if (FAILURE == php_pdo_register_driver(&pdo_oci_driver)) {
+		return FAILURE;
+	}
 
 	// Defer OCI init to PHP_RINIT_FUNCTION because with php-fpm,
 	// NLS_LANG is not yet available here.

ext/pdo_pgsql/pdo_pgsql.c

@@ -65,8 +65,7 @@ PHP_MINIT_FUNCTION(pdo_pgsql)
 	REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_INERROR", (zend_long)PGSQL_TRANSACTION_INERROR);
 	REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_UNKNOWN", (zend_long)PGSQL_TRANSACTION_UNKNOWN);
 
-	php_pdo_register_driver(&pdo_pgsql_driver);
-	return SUCCESS;
+	return php_pdo_register_driver(&pdo_pgsql_driver);
 }
 /* }}} */