com php-src: Give the possibility of the client to pass a factory: ext/mysqlnd/mysqlnd_driver.c ext/mysqlnd/mysqlnd_protoc ol_frame_codec.c
ext/mysqlnd/mysqlnd_protocol_frame _codec.h ext/mysqlnd/mysqlnd_vio.c ext/mysqlnd/mysq lnd_vio.h

From: Date: Tue, 24 Nov 2015 09:23:44 +0000
Subject: com php-src: Give the possibility of the client to pass a factory: ext/mysqlnd/mysqlnd_driver.c ext/mysqlnd/mysqlnd_protoc ol_frame_codec.c
ext/mysqlnd/mysqlnd_protocol_frame _codec.h ext/mysqlnd/mysqlnd_vio.c ext/mysqlnd/mysq lnd_vio.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89992@lists.php.net to get a copy of this message
Commit: 85e4fcf647372228c38186eaf6ab6dd354da0c2b Author: Andrey Hristov <andrey@php.net> Tue, 24 Nov 2015 10:23:22 +0100 Parents: 7e7c2c062fa36efc755e7bbeadda32b7ca41ec81 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=85e4fcf647372228c38186eaf6ab6dd354da0c2b Log: Give the possibility of the client to pass a factory Changed paths: M ext/mysqlnd/mysqlnd_driver.c M ext/mysqlnd/mysqlnd_protocol_frame_codec.c M ext/mysqlnd/mysqlnd_protocol_frame_codec.h M ext/mysqlnd/mysqlnd_vio.c M ext/mysqlnd/mysqlnd_vio.h Diff: diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c index fe7d3f1..fec8a4e 100644 --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@ -140,8 +140,8 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_connection)(MYSQLND_CLASS_METHODS_TYP mysqlnd_stats_init(&data->stats, STAT_LAST, persistent); - data->protocol_frame_codec = mysqlnd_pfc_init(persistent, data->stats, data->error_info); - data->vio = mysqlnd_vio_init(persistent, data->stats, data->error_info); + data->protocol_frame_codec = mysqlnd_pfc_init(persistent, factory, data->stats, data->error_info); + data->vio = mysqlnd_vio_init(persistent, factory, data->stats, data->error_info); data->payload_decoder_factory = mysqlnd_protocol_payload_decoder_factory_init(data, persistent); data->command_factory = mysqlnd_command_factory_get(); diff --git a/ext/mysqlnd/mysqlnd_protocol_frame_codec.c b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c index a6b03df..a41e4bd 100644 --- a/ext/mysqlnd/mysqlnd_protocol_frame_codec.c +++ b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c @@ -473,11 +473,12 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_pfc_init */ PHPAPI MYSQLND_PFC * -mysqlnd_pfc_init(const zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info) +mysqlnd_pfc_init(const zend_bool persistent, MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *object_factory, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info) { + MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *factory = object_factory? object_factory : &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_object_factory); MYSQLND_PFC * pfc; DBG_ENTER("mysqlnd_pfc_init"); - pfc = MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_object_factory).get_protocol_frame_codec(persistent, stats, error_info); + pfc = factory->get_protocol_frame_codec(persistent, stats, error_info); DBG_RETURN(pfc); } /* }}} */ diff --git a/ext/mysqlnd/mysqlnd_protocol_frame_codec.h b/ext/mysqlnd/mysqlnd_protocol_frame_codec.h index 49bb8da..c9e184d 100644 --- a/ext/mysqlnd/mysqlnd_protocol_frame_codec.h +++ b/ext/mysqlnd/mysqlnd_protocol_frame_codec.h @@ -20,8 +20,8 @@ #ifndef MYSQLND_PROTOCOL_FRAME_CODEC_H #define MYSQLND_PROTOCOL_FRAME_CODEC_H -PHPAPI MYSQLND_PFC * mysqlnd_pfc_init(const zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info); -PHPAPI void mysqlnd_pfc_free(MYSQLND_PFC * const net, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info); +PHPAPI MYSQLND_PFC * mysqlnd_pfc_init(const zend_bool persistent, MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *object_factory, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info); +PHPAPI void mysqlnd_pfc_free(MYSQLND_PFC * const pfc, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info); #endif /* MYSQLND_PROTOCOL_FRAME_CODEC_H */ diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c index 1d9b00c..f559ba6 100644 --- a/ext/mysqlnd/mysqlnd_vio.c +++ b/ext/mysqlnd/mysqlnd_vio.c @@ -776,11 +776,12 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_vio_init */ PHPAPI MYSQLND_VIO * -mysqlnd_vio_init(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info) +mysqlnd_vio_init(zend_bool persistent, MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *object_factory, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info) { + MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *factory = object_factory? object_factory : &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_object_factory); MYSQLND_VIO * vio; DBG_ENTER("mysqlnd_vio_init"); - vio = MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_object_factory).get_vio(persistent, stats, error_info); + vio = factory->get_vio(persistent, stats, error_info); DBG_RETURN(vio); } /* }}} */ diff --git a/ext/mysqlnd/mysqlnd_vio.h b/ext/mysqlnd/mysqlnd_vio.h index 4e8333c...1e2560e 100644 --- a/ext/mysqlnd/mysqlnd_vio.h +++ b/ext/mysqlnd/mysqlnd_vio.h @@ -19,7 +19,7 @@ #ifndef MYSQLND_VIO_H #define MYSQLND_VIO_H -PHPAPI MYSQLND_VIO * mysqlnd_vio_init(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info); +PHPAPI MYSQLND_VIO * mysqlnd_vio_init(zend_bool persistent, MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *object_factory, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info); PHPAPI void mysqlnd_vio_free(MYSQLND_VIO * const vio, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info); #endif /* MYSQLND_VIO_H */

« previous php.cvs (#89992) next »