1 files changed, 25 insertions, 25 deletions

diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c
index b12c0f8ea3..6bf57de632 100644
--- a/ext/mysqlnd/mysqlnd_driver.c
+++ b/ext/mysqlnd/mysqlnd_driver.c
@@ -140,7 +140,7 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_connection)(struct st_mysqlnd_object_
 
 	mysqlnd_stats_init(&data->stats, STAT_LAST, persistent);
 
-	data->net = mysqlnd_net_init(persistent, data->stats, data->error_info);
+	data->net = mysqlnd_ppec_init(persistent, data->stats, data->error_info);
 	data->vio = mysqlnd_vio_init(persistent, data->stats, data->error_info);
 	data->payload_decoder_factory = mysqlnd_protocol_payload_decoder_factory_init(data, persistent);
 	data->command_factory = mysqlnd_command_factory_get();
@@ -243,37 +243,37 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement)(MYSQLND_CONN_DATA
 /* }}} */
 
 
-/* {{{ mysqlnd_object_factory::get_net */
-static MYSQLND_NET *
-MYSQLND_METHOD(mysqlnd_object_factory, get_net)(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info)
+/* {{{ mysqlnd_object_factory::get_ppec */
+static MYSQLND_PPEC *
+MYSQLND_METHOD(mysqlnd_object_factory, get_ppec)(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info)
 {
-	size_t net_alloc_size = sizeof(MYSQLND_NET) + mysqlnd_plugin_count() * sizeof(void *);
-	size_t net_data_alloc_size = sizeof(MYSQLND_NET_DATA) + mysqlnd_plugin_count() * sizeof(void *);
-	MYSQLND_NET * net = mnd_pecalloc(1, net_alloc_size, persistent);
-	MYSQLND_NET_DATA * net_data = mnd_pecalloc(1, net_data_alloc_size, persistent);
+	size_t ppec_alloc_size = sizeof(MYSQLND_PPEC) + mysqlnd_plugin_count() * sizeof(void *);
+	size_t ppec_data_alloc_size = sizeof(MYSQLND_PPEC_DATA) + mysqlnd_plugin_count() * sizeof(void *);
+	MYSQLND_PPEC * ppec = mnd_pecalloc(1, ppec_alloc_size, persistent);
+	MYSQLND_PPEC_DATA * ppec_data = mnd_pecalloc(1, ppec_data_alloc_size, persistent);
 
-	DBG_ENTER("mysqlnd_object_factory::get_net");
+	DBG_ENTER("mysqlnd_object_factory::get_ppec");
 	DBG_INF_FMT("persistent=%u", persistent);
-	if (net && net_data) {
-		net->data = net_data;
-		net->persistent = net->data->persistent = persistent;
-		net->data->m = *mysqlnd_net_get_methods();
-
-		if (PASS != net->data->m.init(net, stats, error_info)) {
-			net->data->m.dtor(net, stats, error_info);
-			net = NULL;
+	if (ppec && ppec_data) {
+		ppec->data = ppec_data;
+		ppec->persistent = ppec->data->persistent = persistent;
+		ppec->data->m = *mysqlnd_ppec_get_methods();
+
+		if (PASS != ppec->data->m.init(ppec, stats, error_info)) {
+			ppec->data->m.dtor(ppec, stats, error_info);
+			ppec = NULL;
 		}
 	} else {
-		if (net_data) {
-			mnd_pefree(net_data, persistent);
-			net_data = NULL;
+		if (ppec_data) {
+			mnd_pefree(ppec_data, persistent);
+			ppec_data = NULL;
 		}
-		if (net) {
-			mnd_pefree(net, persistent);
-			net = NULL;
+		if (ppec) {
+			mnd_pefree(ppec, persistent);
+			ppec = NULL;
 		}
 	}
-	DBG_RETURN(net);
+	DBG_RETURN(ppec);
 }
 /* }}} */
 
@@ -337,7 +337,7 @@ PHPAPI MYSQLND_CLASS_METHODS_START(mysqlnd_object_factory)
 	MYSQLND_METHOD(mysqlnd_object_factory, get_connection),
 	MYSQLND_METHOD(mysqlnd_object_factory, clone_connection_object),
 	MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement),
-	MYSQLND_METHOD(mysqlnd_object_factory, get_net),
+	MYSQLND_METHOD(mysqlnd_object_factory, get_ppec),
 	MYSQLND_METHOD(mysqlnd_object_factory, get_vio),
 	MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_payload_decoder_factory)
 MYSQLND_CLASS_METHODS_END;