- Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd

6 files changed, 155 insertions, 1 deletions

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 3f9a7d653a..89fe7b15ff 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -529,6 +529,31 @@ static PHP_GINIT_FUNCTION(mysql)
 }
 /* }}} */
 
+#ifdef MYSQL_USE_MYSQLND
+static MYSQLND *mysql_convert_zv_to_mysqlnd(zval *zv)
+{
+	php_mysql_conn *mysql;
+
+	if (Z_TYPE_P(zv) != IS_RESOURCE) {
+		/* Might be nicer to check resource type, too, but ext/mysql is the only one using resources so emitting an error is not to bad, while usually this hook should be silent */
+		return NULL;
+	}
+
+	mysql = (php_mysql_conn *)zend_fetch_resource(&zv TSRMLS_CC, -1, "MySQL-Link", NULL, 2, le_link, le_plink);
+
+	if (!mysql) {
+		return NULL;
+	}
+
+	return mysql->conn;
+}
+
+static mysqlnd_api_extension_t mysqlnd_api_ext = {
+	&mysql_module_entry,
+	mysql_convert_zv_to_mysqlnd
+};
+#endif
+
 /* {{{ PHP_MINIT_FUNCTION
  */
 ZEND_MODULE_STARTUP_D(mysql)
@@ -557,6 +582,10 @@ ZEND_MODULE_STARTUP_D(mysql)
 #endif
 #endif
 
+#ifdef MYSQL_USE_MYSQLND
+	mysqlnd_register_api_extension(&mysqlnd_api_ext);
+#endif
+
 	return SUCCESS;
 }
 /* }}} */
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 4ba13f5116..c94ddd03db 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -30,6 +30,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
+#include "php_mysqli.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 #include "zend_exceptions.h"
@@ -526,6 +527,29 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
 }
 /* }}} */
 
+#ifdef MYSQLI_USE_MYSQLND
+static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval *zv)
+{
+	if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == mysqli_link_class_entry) {
+		MY_MYSQL *mysql;
+		MYSQLI_RESOURCE  *my_res;
+		mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC);
+		if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
+			/* We know that we have a mysqli object, so this failure should be emitted */
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", intern->zo.ce->name);
+			return NULL;
+		}
+		mysql = ((MY_MYSQL *)my_res->ptr)->mysql;
+		return mysql ? mysql->mysql : NULL;
+	}
+	return NULL;
+}
+
+static mysqlnd_api_extension_t mysqli_api_ext = {
+	&mysqli_module_entry,
+	mysqli_convert_zv_to_mysqlnd
+};
+#endif
 
 /* {{{ PHP_INI_BEGIN
 */
@@ -813,6 +837,11 @@ PHP_MINIT_FUNCTION(mysqli)
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_BACKUP_LOG", REFRESH_BACKUP_LOG, CONST_CS | CONST_PERSISTENT);
 #endif
 
+
+#ifdef MYSQL_USE_MYSQLND
+	mysqlnd_register_api_extension(&mysqli_api_ext);
+#endif
+
 	return SUCCESS;
 }
 /* }}} */
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 7f04d35517..5db03278dc 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -68,6 +68,7 @@ static struct st_mysqlnd_conn_methods *mysqlnd_conn_methods;
 
 static struct st_mysqlnd_plugin_core mysqlnd_plugin_core;
 
+static HashTable mysqlnd_api_ext_ht;
 
 /* {{{ mysqlnd_error_list_pdtor */
 static void
@@ -92,6 +93,7 @@ PHPAPI void mysqlnd_library_end(TSRMLS_D)
 		mysqlnd_stats_end(mysqlnd_global_stats);
 		mysqlnd_global_stats = NULL;
 		mysqlnd_library_initted = FALSE;
+		zend_hash_destroy(&mysqlnd_api_ext_ht);
 	}
 }
 /* }}} */
@@ -2542,10 +2544,46 @@ PHPAPI void mysqlnd_library_init(TSRMLS_D)
 		mysqlnd_example_plugin_register(TSRMLS_C);
 		mysqlnd_debug_trace_plugin_register(TSRMLS_C);
 		mysqlnd_register_builtin_authentication_plugins(TSRMLS_C);
+
+		zend_hash_init(&mysqlnd_api_ext_ht, 3, NULL, NULL, 1);
 	}
 }
 /* }}} */
 
+/* {{{ myslqnd_get_api_extensions */
+PHPAPI HashTable *mysqlnd_get_api_extensions()
+{
+	return &mysqlnd_api_ext_ht;
+}
+/* }}} */
+
+/* {{{ mysqlnd_register_api_extension */
+PHPAPI void mysqlnd_register_api_extension(mysqlnd_api_extension_t *apiext)
+{
+	zend_hash_add(&mysqlnd_api_ext_ht, apiext->module->name, strlen(apiext->module->name)+1, &apiext, sizeof(mysqlnd_api_extension_t), NULL);
+}
+/* }}} */
+
+/* {{{ zval_to_mysqlnd */
+PHPAPI MYSQLND* zval_to_mysqlnd(zval *zv)
+{
+	MYSQLND* retval;
+	mysqlnd_api_extension_t **elem;
+
+	for (zend_hash_internal_pointer_reset(&mysqlnd_api_ext_ht);
+			zend_hash_get_current_data(&mysqlnd_api_ext_ht, (void **)&elem) == SUCCESS;
+			zend_hash_move_forward(&mysqlnd_api_ext_ht)) {
+		if ((*elem)->conversion_cb) {
+			retval = (*elem)->conversion_cb(zv);
+			if (retval) {
+				return retval;
+			}
+		}
+	}
+
+	return NULL;
+}
+/* }}} */
 
 /* {{{ mysqlnd_conn_get_methods */
 PHPAPI struct st_mysqlnd_conn_methods * mysqlnd_conn_get_methods()
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index ebd5cf40f7..760ee529f9 100644
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -310,6 +310,15 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd)
 
 PHPAPI void mysqlnd_minfo_print_hash(zval *values);
 
+typedef struct {
+	zend_module_entry *module;
+	MYSQLND *(*conversion_cb)(zval *zv);
+} mysqlnd_api_extension_t;
+
+PHPAPI HashTable *mysqlnd_get_api_extensions();
+PHPAPI void mysqlnd_register_api_extension(mysqlnd_api_extension_t *apiext);
+PHPAPI MYSQLND* zval_to_mysqlnd(zval *zv);
+
 #endif	/* MYSQLND_H */
 
 
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index 5682bdeef8..2f477c6c95 100644
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -133,6 +133,20 @@ mysqlnd_minfo_dump_loaded_plugins(void *pDest, void * buf TSRMLS_DC)
 }
 /* }}} */
 
+/* {{{ mysqlnd_minfo_dump_api_plugins */
+static int
+mysqlnd_minfo_dump_api_plugins(void *pDest, void * buf TSRMLS_DC)
+{
+	smart_str * buffer = (smart_str *) buf;
+	mysqlnd_api_extension_t *ext = *(mysqlnd_api_extension_t **) pDest;
+	if (buffer->len) {
+		smart_str_appendc(buffer, ',');
+	}
+	smart_str_appends(buffer, ext->module->name);
+	return ZEND_HASH_APPLY_KEEP;
+}
+/* }}} */
+
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -165,7 +179,6 @@ PHP_MINFO_FUNCTION(mysqlnd)
 	php_info_print_table_row(2, "Collecting memory statistics", MYSQLND_G(collect_memory_statistics)? "Yes":"No");
 
 	php_info_print_table_row(2, "Tracing", MYSQLND_G(debug)? MYSQLND_G(debug):"n/a");
-	php_info_print_table_end();
 
 	/* loaded plugins */
 	{
@@ -174,8 +187,16 @@ PHP_MINFO_FUNCTION(mysqlnd)
 		smart_str_0(&tmp_str);
 		php_info_print_table_row(2, "Loaded plugins", tmp_str.c);
 		smart_str_free(&tmp_str);
+
+		zend_hash_apply_with_argument(mysqlnd_get_api_extensions(), mysqlnd_minfo_dump_api_plugins, &tmp_str);
+		smart_str_0(&tmp_str);
+		php_info_print_table_row(2, "API Extensions", tmp_str.c);
+		smart_str_free(&tmp_str);
 	}
 
+	php_info_print_table_end();
+
+
 	/* Print client stats */
 	mysqlnd_plugin_apply_with_argument(mysqlnd_minfo_dump_plugin_stats, NULL);
 }
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 97cce4a1de..9bb9b1a684 100755
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -47,6 +47,29 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql);
 # endif
 #endif
 
+#ifdef PDO_USE_MYSQLND
+static MYSQLND *pdo_mysql_convert_zv_to_mysqlnd(zval *zv)
+{
+	if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == php_pdo_get_dbh_ce()) {
+		pdo_dbh_t *dbh = zend_object_store_get_object(zv TSRMLS_CC);
+
+		if (!dbh || dbh->driver != &pdo_mysql_driver) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Provided PDO instance is not using MySQL but %s", dbh->driver->driver_name);
+			return NULL;
+		}
+
+		return ((pdo_mysql_db_handle *)dbh)->server;
+	}
+	return NULL;
+}
+
+static mysqlnd_api_extension_t pdo_mysql_api_ext = {
+	&pdo_mysql_module_entry,
+	pdo_mysql_convert_zv_to_mysqlnd
+};
+#endif
+
+
 /* {{{ PHP_INI_BEGIN
 */
 PHP_INI_BEGIN()
@@ -84,6 +107,11 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (long)PDO_MYSQL_ATTR_SSL_CA);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (long)PDO_MYSQL_ATTR_SSL_CAPATH);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (long)PDO_MYSQL_ATTR_SSL_CIPHER);
+
+#ifdef PDO_USE_MYSQLND
+	mysqlnd_register_api_extension(&pdo_mysql_api_ext);
+#endif
+
 	return php_pdo_register_driver(&pdo_mysql_driver);
 }
 /* }}} */