From: Andrey Hristov Date: Wed, 16 Mar 2016 09:47:27 +0000 (+0100) Subject: Merge branch 'PHP-7.0' X-Git-Tag: php-7.1.0alpha1~474^2~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a33ee63e83a412b679eb2d72c63beb0064a3b5b;p=php Merge branch 'PHP-7.0' --- 3a33ee63e83a412b679eb2d72c63beb0064a3b5b diff --cc ext/mysqlnd/mysqlnd_alloc.c index 2a0141c78b,fb62a7b138..6ee19a8630 --- a/ext/mysqlnd/mysqlnd_alloc.c +++ b/ext/mysqlnd/mysqlnd_alloc.c @@@ -12,12 -12,13 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ --/* $Id: mysqlnd_debug.c 309303 2011-03-16 12:42:59Z andrey $ */ #include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h" diff --cc ext/mysqlnd/mysqlnd_alloc.h index 85dfba5d09,92d144954c..894da77823 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@@ -12,8 -12,9 +12,8 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_auth.c index 18a842d008,7c9cead854..6cbd3e1149 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@@ -12,9 -12,9 +12,8 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_auth.h index d7d652e8fd,0000000000..db9460df54 mode 100644,000000..100644 --- a/ext/mysqlnd/mysqlnd_auth.h +++ b/ext/mysqlnd/mysqlnd_auth.h @@@ -1,126 -1,0 +1,126 @@@ +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2016 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | ++ | Authors: Andrey Hristov | ++ | Ulf Wendel | + +----------------------------------------------------------------------+ +*/ + +#ifndef MYSQLND_AUTH_H +#define MYSQLND_AUTH_H +enum_func_status +mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, + const char * const user, + const char * const passwd, + const size_t passwd_len, + const char * const db, + const size_t db_len, + const MYSQLND_SESSION_OPTIONS * const session_options, + zend_ulong mysql_flags, + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, + size_t * switch_to_auth_protocol_len, + zend_uchar ** switch_to_auth_protocol_data, + size_t * switch_to_auth_protocol_data_len + ); + +enum_func_status +mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, + const char * const user, + const char * const passwd, + const size_t passwd_len, + const char * const db, + const size_t db_len, + const MYSQLND_SESSION_OPTIONS * const session_options, + zend_ulong mysql_flags, + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, + size_t * switch_to_auth_protocol_len, + zend_uchar ** switch_to_auth_protocol_data, + size_t * switch_to_auth_protocol_data_len + ); + +enum_func_status +mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, + const char * const user, + const size_t user_len, + const char * const passwd, + const size_t passwd_len, + const char * const db, + const size_t db_len, + const zend_bool silent, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, + zend_uchar * auth_plugin_data, + size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, + size_t * switch_to_auth_protocol_len, + zend_uchar ** switch_to_auth_protocol_data, + size_t * switch_to_auth_protocol_data_len + ); + + +enum_func_status +mysqlnd_connect_run_authentication( + MYSQLND_CONN_DATA * conn, + const char * const user, + const char * const passwd, + const char * const db, + size_t db_len, + size_t passwd_len, + MYSQLND_STRING authentication_plugin_data, + const char * const authentication_protocol, + const unsigned int charset_no, + size_t server_capabilities, + const MYSQLND_SESSION_OPTIONS * const session_options, + zend_ulong mysql_flags + ); + +enum_func_status +mysqlnd_run_authentication( + MYSQLND_CONN_DATA * conn, + const char * const user, + const char * const passwd, + const size_t passwd_len, + const char * const db, + const size_t db_len, + const MYSQLND_STRING auth_plugin_data, + const char * const auth_protocol, + unsigned int charset_no, + const MYSQLND_SESSION_OPTIONS * const session_options, + zend_ulong mysql_flags, + zend_bool silent, + zend_bool is_change_user + ); + +PHPAPI void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const pass, const size_t pass_len); + +#endif /* MYSQLND_AUTH_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff --cc ext/mysqlnd/mysqlnd_block_alloc.c index 8729606ade,9c5f12130b..60e6f938ef --- a/ext/mysqlnd/mysqlnd_block_alloc.c +++ b/ext/mysqlnd/mysqlnd_block_alloc.c @@@ -12,13 -12,14 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ --/* $Id$ */ -- #include "php.h" #include "mysqlnd.h" #include "mysqlnd_block_alloc.h" diff --cc ext/mysqlnd/mysqlnd_block_alloc.h index b6d832c9a4,2e6a3a2446..54529a0aca --- a/ext/mysqlnd/mysqlnd_block_alloc.h +++ b/ext/mysqlnd/mysqlnd_block_alloc.h @@@ -12,8 -12,9 +12,8 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_charset.c index 85c90ac6a6,1ed35f9a51..c22430ef30 --- a/ext/mysqlnd/mysqlnd_charset.c +++ b/ext/mysqlnd/mysqlnd_charset.c @@@ -12,12 -12,14 +12,13 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | + | Georg Richter | +----------------------------------------------------------------------+ */ + #include "php.h" -#include "php_globals.h" #include "mysqlnd.h" #include "mysqlnd_priv.h" #include "mysqlnd_debug.h" diff --cc ext/mysqlnd/mysqlnd_commands.h index bca6ea4cc1,0000000000..0df83a91a7 mode 100644,000000..100644 --- a/ext/mysqlnd/mysqlnd_commands.h +++ b/ext/mysqlnd/mysqlnd_commands.h @@@ -1,34 -1,0 +1,34 @@@ +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2016 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | ++ | Authors: Andrey Hristov | ++ | Ulf Wendel | + +----------------------------------------------------------------------+ +*/ + +#ifndef MYSQLND_COMMANDS_H +#define MYSQLND_COMMANDS_H + +extern func_mysqlnd__command_factory mysqlnd_command_factory; + +#endif /* MYSQLND_COMMANDS_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff --cc ext/mysqlnd/mysqlnd_connection.c index 6f350cfd79,cc9da2f088..bb582dbf6a --- a/ext/mysqlnd/mysqlnd_connection.c +++ b/ext/mysqlnd/mysqlnd_connection.c @@@ -12,9 -12,9 +12,8 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_connection.h index 0668d09d92,0000000000..71fca55ceb mode 100644,000000..100644 --- a/ext/mysqlnd/mysqlnd_connection.h +++ b/ext/mysqlnd/mysqlnd_connection.h @@@ -1,87 -1,0 +1,87 @@@ +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2016 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | ++ | Authors: Andrey Hristov | ++ | Ulf Wendel | + +----------------------------------------------------------------------+ +*/ + +#ifndef MYSQLND_CONNECTION_H +#define MYSQLND_CONNECTION_H + +PHPAPI extern const char * const mysqlnd_out_of_sync; +PHPAPI extern const char * const mysqlnd_server_gone; +PHPAPI extern const char * const mysqlnd_out_of_memory; + + +void mysqlnd_upsert_status_init(MYSQLND_UPSERT_STATUS * const upsert_status); + +#define UPSERT_STATUS_RESET(status) (status)->m->reset((status)) + +#define UPSERT_STATUS_GET_SERVER_STATUS(status) (status)->server_status +#define UPSERT_STATUS_SET_SERVER_STATUS(status, server_st) (status)->server_status = (server_st) + +#define UPSERT_STATUS_GET_WARNINGS(status) (status)->warning_count +#define UPSERT_STATUS_SET_WARNINGS(status, warnings) (status)->warning_count = (warnings) + +#define UPSERT_STATUS_GET_AFFECTED_ROWS(status) (status)->affected_rows +#define UPSERT_STATUS_SET_AFFECTED_ROWS(status, rows) (status)->affected_rows = (rows) +#define UPSERT_STATUS_SET_AFFECTED_ROWS_TO_ERROR(status) (status)->m->set_affected_rows_to_error((status)) + +#define UPSERT_STATUS_GET_LAST_INSERT_ID(status) (status)->last_insert_id +#define UPSERT_STATUS_SET_LAST_INSERT_ID(status, id) (status)->last_insert_id = (id) + + +/* Error handling */ +#define SET_NEW_MESSAGE(buf, buf_len, message, len, persistent) \ + {\ + if ((buf)) { \ + mnd_pefree((buf), (persistent)); \ + } \ + if ((message)) { \ + (buf) = mnd_pestrndup((message), (len), (persistent)); \ + } else { \ + (buf) = NULL; \ + } \ + (buf_len) = (len); \ + } + +#define SET_EMPTY_MESSAGE(buf, buf_len, persistent) \ + {\ + if ((buf)) { \ + mnd_pefree((buf), (persistent)); \ + (buf) = NULL; \ + } \ + (buf_len) = 0; \ + } + + +PHPAPI enum_func_status mysqlnd_error_info_init(MYSQLND_ERROR_INFO * const info, const zend_bool persistent); +PHPAPI void mysqlnd_error_info_free_contents(MYSQLND_ERROR_INFO * const info); + +#define GET_CONNECTION_STATE(state_struct) (state_struct)->m->get((state_struct)) +#define SET_CONNECTION_STATE(state_struct, s) (state_struct)->m->set((state_struct), (s)) + +PHPAPI void mysqlnd_connection_state_init(struct st_mysqlnd_connection_state * const state); + +#endif /* MYSQLND_CONNECTION_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff --cc ext/mysqlnd/mysqlnd_debug.c index 1c09d0c564,fd74b69684..c343b4560c --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@@ -12,10 -12,12 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h" diff --cc ext/mysqlnd/mysqlnd_debug.h index 19b1b34ab3,854ab4cb22..c9eced8af3 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@@ -12,10 -12,12 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #ifndef MYSQLND_DEBUG_H #define MYSQLND_DEBUG_H diff --cc ext/mysqlnd/mysqlnd_driver.c index ad8137bf68,f62b887748..1cb6d8f35a --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@@ -12,21 -12,19 +12,21 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #include "php.h" #include "mysqlnd.h" +#include "mysqlnd_vio.h" +#include "mysqlnd_protocol_frame_codec.h" #include "mysqlnd_wireprotocol.h" +#include "mysqlnd_connection.h" +#include "mysqlnd_ps.h" +#include "mysqlnd_plugin.h" #include "mysqlnd_priv.h" -#include "mysqlnd_result.h" #include "mysqlnd_statistics.h" -#include "mysqlnd_charset.h" #include "mysqlnd_debug.h" #include "mysqlnd_reverse_api.h" #include "mysqlnd_ext_plugin.h" diff --cc ext/mysqlnd/mysqlnd_ext_plugin.c index dd55a1ff6e,18873a08b4..4da47f6921 --- a/ext/mysqlnd/mysqlnd_ext_plugin.c +++ b/ext/mysqlnd/mysqlnd_ext_plugin.c @@@ -12,10 -12,12 +12,12 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | ++ | Johannes Schlüter | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h" diff --cc ext/mysqlnd/mysqlnd_ext_plugin.h index d2a643d035,d20868a4a1..ecab5e8fc6 --- a/ext/mysqlnd/mysqlnd_ext_plugin.h +++ b/ext/mysqlnd/mysqlnd_ext_plugin.h @@@ -12,10 -12,12 +12,12 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | ++ | Johannes Schlüter | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #ifndef MYSQLND_EXT_PLUGIN_H #define MYSQLND_EXT_PLUGIN_H diff --cc ext/mysqlnd/mysqlnd_libmysql_compat.h index 32d55cbd6e,6be504f70f..0556ef1d38 --- a/ext/mysqlnd/mysqlnd_libmysql_compat.h +++ b/ext/mysqlnd/mysqlnd_libmysql_compat.h @@@ -12,12 -12,12 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Georg Richter | - | Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | + | Georg Richter | +----------------------------------------------------------------------+ - */ - #ifndef MYSQLND_LIBMYSQL_COMPAT_H #define MYSQLND_LIBMYSQL_COMPAT_H diff --cc ext/mysqlnd/mysqlnd_loaddata.c index e82a944ff3,0edffdefaf..14dee737bf --- a/ext/mysqlnd/mysqlnd_loaddata.c +++ b/ext/mysqlnd/mysqlnd_loaddata.c @@@ -12,12 -12,14 +12,12 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | + | Georg Richter | +----------------------------------------------------------------------+ */ - #include "php.h" -#include "php_globals.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" #include "mysqlnd_priv.h" diff --cc ext/mysqlnd/mysqlnd_net.c index bf86a17a08,56c9d30df1..111a4898d0 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@@ -12,9 -12,9 +12,8 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_plugin.c index 81dba83fdb,8ec8162bd4..e4eba190de --- a/ext/mysqlnd/mysqlnd_plugin.c +++ b/ext/mysqlnd/mysqlnd_plugin.c @@@ -12,9 -13,9 +13,8 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_plugin.h index 67ec540ddc,0000000000..f01c99579a mode 100644,000000..100644 --- a/ext/mysqlnd/mysqlnd_plugin.h +++ b/ext/mysqlnd/mysqlnd_plugin.h @@@ -1,40 -1,0 +1,41 @@@ +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2016 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | ++ | Authors: Andrey Hristov | ++ | Ulf Wendel | + +----------------------------------------------------------------------+ +*/ ++ +#ifndef MYSQLND_PLUGIN_H +#define MYSQLND_PLUGIN_H + + +void mysqlnd_plugin_subsystem_init(void); +void mysqlnd_plugin_subsystem_end(void); + +void mysqlnd_register_builtin_authentication_plugins(void); + +void mysqlnd_example_plugin_register(void); + +#endif /* MYSQLND_PLUGIN_H */ + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff --cc ext/mysqlnd/mysqlnd_priv.h index 3e8b437cb1,82260c66c1..cea1bc68c7 --- a/ext/mysqlnd/mysqlnd_priv.h +++ b/ext/mysqlnd/mysqlnd_priv.h @@@ -12,12 -12,151 +12,13 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #ifndef MYSQLND_PRIV_H #define MYSQLND_PRIV_H - -#ifdef ZTS -#include "TSRM.h" -#endif - -#define MYSQLND_STR_W_LEN(str) str, (sizeof(str) - 1) - -#define MYSQLND_DEBUG_DUMP_TIME 1 -#define MYSQLND_DEBUG_DUMP_TRACE 2 -#define MYSQLND_DEBUG_DUMP_PID 4 -#define MYSQLND_DEBUG_DUMP_LINE 8 -#define MYSQLND_DEBUG_DUMP_FILE 16 -#define MYSQLND_DEBUG_DUMP_LEVEL 32 -#define MYSQLND_DEBUG_APPEND 64 -#define MYSQLND_DEBUG_FLUSH 128 -#define MYSQLND_DEBUG_TRACE_MEMORY_CALLS 256 -#define MYSQLND_DEBUG_PROFILE_CALLS 512 - - -/* Client Error codes */ -#define CR_UNKNOWN_ERROR 2000 -#define CR_CONNECTION_ERROR 2002 -#define CR_SERVER_GONE_ERROR 2006 -#define CR_OUT_OF_MEMORY 2008 -#define CR_SERVER_LOST 2013 -#define CR_COMMANDS_OUT_OF_SYNC 2014 -#define CR_CANT_FIND_CHARSET 2019 -#define CR_MALFORMED_PACKET 2027 -#define CR_NOT_IMPLEMENTED 2054 -#define CR_NO_PREPARE_STMT 2030 -#define CR_PARAMS_NOT_BOUND 2031 -#define CR_INVALID_PARAMETER_NO 2034 -#define CR_INVALID_BUFFER_USE 2035 - -#define MYSQLND_EE_FILENOTFOUND 7890 - -#define UNKNOWN_SQLSTATE "HY000" - -#define MAX_CHARSET_LEN 32 - - -#define SET_ERROR_AFF_ROWS(s) (s)->upsert_status->affected_rows = (uint64_t) ~0 - -/* Error handling */ -#define SET_NEW_MESSAGE(buf, buf_len, message, len, persistent) \ - {\ - if ((buf)) { \ - mnd_pefree((buf), (persistent)); \ - } \ - if ((message)) { \ - (buf) = mnd_pestrndup((message), (len), (persistent)); \ - } else { \ - (buf) = NULL; \ - } \ - (buf_len) = (len); \ - } - -#define SET_EMPTY_MESSAGE(buf, buf_len, persistent) \ - {\ - if ((buf)) { \ - mnd_pefree((buf), (persistent)); \ - (buf) = NULL; \ - } \ - (buf_len) = 0; \ - } - - -#define SET_EMPTY_ERROR(error_info) \ - { \ - (error_info).error_no = 0; \ - (error_info).error[0] = '\0'; \ - strlcpy((error_info).sqlstate, "00000", sizeof((error_info).sqlstate)); \ - if ((error_info).error_list) { \ - zend_llist_clean((error_info).error_list); \ - } \ - } - - -#define SET_CLIENT_ERROR(error_info, a, b, c) \ -{ \ - if (0 == (a)) { \ - SET_EMPTY_ERROR((error_info)); \ - } else { \ - (error_info).error_no = (a); \ - strlcpy((error_info).sqlstate, (b), sizeof((error_info).sqlstate)); \ - strlcpy((error_info).error, (c), sizeof((error_info).error)); \ - if ((error_info).error_list) {\ - MYSQLND_ERROR_LIST_ELEMENT error_for_the_list = {0}; \ - \ - error_for_the_list.error_no = (a); \ - strlcpy(error_for_the_list.sqlstate, (b), sizeof(error_for_the_list.sqlstate)); \ - error_for_the_list.error = mnd_pestrdup((c), TRUE); \ - if (error_for_the_list.error) { \ - DBG_INF_FMT("adding error [%s] to the list", error_for_the_list.error); \ - zend_llist_add_element((error_info).error_list, &error_for_the_list); \ - } \ - } \ - } \ -} - - -#define COPY_CLIENT_ERROR(error_info_to, error_info_from) \ - { \ - SET_CLIENT_ERROR((error_info_to), (error_info_from).error_no, (error_info_from).sqlstate, (error_info_from).error); \ - } - - -#define SET_OOM_ERROR(error_info) SET_CLIENT_ERROR((error_info), CR_OUT_OF_MEMORY, UNKNOWN_SQLSTATE, mysqlnd_out_of_memory) - - -#define SET_STMT_ERROR(stmt, a, b, c) SET_CLIENT_ERROR(*(stmt)->error_info, a, b, c) - -#define CONN_GET_STATE(c) (c)->m->get_state((c)) -#define CONN_SET_STATE(c, s) (c)->m->set_state((c), (s)) - -/* PS stuff */ -typedef void (*ps_field_fetch_func)(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row); -struct st_mysqlnd_perm_bind { - ps_field_fetch_func func; - /* should be signed int */ - int pack_len; - unsigned int php_type; - zend_bool is_possibly_blob; - zend_bool can_ret_as_str_in_uni; -}; - -extern struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST + 1]; - -enum_func_status mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES * result, void * param, unsigned int flags, zend_bool * fetched_anything); -enum_func_status mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, unsigned int flags, zend_bool * fetched_anything); - - -PHPAPI extern const char * const mysqlnd_old_passwd; -PHPAPI extern const char * const mysqlnd_out_of_sync; -PHPAPI extern const char * const mysqlnd_server_gone; -PHPAPI extern const char * const mysqlnd_out_of_memory; - PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_object_factory); PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_conn); PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_conn_data); diff --cc ext/mysqlnd/mysqlnd_protocol_frame_codec.h index 95a943cae1,0000000000..b00d0c5b08 mode 100644,000000..100644 --- a/ext/mysqlnd/mysqlnd_protocol_frame_codec.h +++ b/ext/mysqlnd/mysqlnd_protocol_frame_codec.h @@@ -1,35 -1,0 +1,35 @@@ +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2016 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | ++ | Authors: Andrey Hristov | ++ | Ulf Wendel | + +----------------------------------------------------------------------+ +*/ + +#ifndef MYSQLND_PROTOCOL_FRAME_CODEC_H +#define MYSQLND_PROTOCOL_FRAME_CODEC_H + +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 */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff --cc ext/mysqlnd/mysqlnd_ps.c index 1e37f79bf4,7053ebe8e7..4c3ee8b2a4 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@@ -12,11 -12,12 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" diff --cc ext/mysqlnd/mysqlnd_ps_codec.c index 081483d835,e0b6c5630f..d989101060 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@@ -12,9 -12,9 +12,8 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_result.c index d649efcbb9,84985f1992..fa80ca1ca6 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@@ -12,11 -12,12 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" diff --cc ext/mysqlnd/mysqlnd_result.h index aeda4a218f,3351b9eae0..3f91195b32 --- a/ext/mysqlnd/mysqlnd_result.h +++ b/ext/mysqlnd/mysqlnd_result.h @@@ -12,11 -12,12 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #ifndef MYSQLND_RESULT_H #define MYSQLND_RESULT_H diff --cc ext/mysqlnd/mysqlnd_result_meta.c index 834073de13,49954ead86..3934edd03e --- a/ext/mysqlnd/mysqlnd_result_meta.c +++ b/ext/mysqlnd/mysqlnd_result_meta.c @@@ -12,15 -12,14 +12,15 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #include "php.h" #include "mysqlnd.h" +#include "mysqlnd_connection.h" +#include "mysqlnd_ps.h" #include "mysqlnd_priv.h" #include "mysqlnd_result.h" #include "mysqlnd_wireprotocol.h" diff --cc ext/mysqlnd/mysqlnd_result_meta.h index 6fc5d07a44,d877d086f0..4f22dc8a8f --- a/ext/mysqlnd/mysqlnd_result_meta.h +++ b/ext/mysqlnd/mysqlnd_result_meta.h @@@ -12,9 -12,9 +12,9 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | ++ | Johannes Schlüter | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_reverse_api.c index edcf833f91,753cbf9eff..3ac3ff8ff2 --- a/ext/mysqlnd/mysqlnd_reverse_api.c +++ b/ext/mysqlnd/mysqlnd_reverse_api.c @@@ -12,9 -12,9 +12,9 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | ++ | Johannes Schlüter | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_statistics.h index 1c0e5fe042,2dde6e94c2..ea909fcfcb --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@@ -12,10 -12,12 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #ifndef MYSQLND_STATISTICS_H #define MYSQLND_STATISTICS_H diff --cc ext/mysqlnd/mysqlnd_structs.h index 4832cb1381,c319784481..3f26425604 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@@ -12,9 -12,9 +12,8 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ diff --cc ext/mysqlnd/mysqlnd_vio.h index 5b410bf49e,a137b2a327..bb773516b8 --- a/ext/mysqlnd/mysqlnd_vio.h +++ b/ext/mysqlnd/mysqlnd_vio.h @@@ -12,17 -12,19 +12,18 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + -#ifndef MYSQLND_NET_H -#define MYSQLND_NET_H +#ifndef MYSQLND_VIO_H +#define MYSQLND_VIO_H -PHPAPI MYSQLND_NET * mysqlnd_net_init(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info); -PHPAPI void mysqlnd_net_free(MYSQLND_NET * const net, 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_NET_H */ +#endif /* MYSQLND_VIO_H */ /* * Local variables: diff --cc ext/mysqlnd/mysqlnd_wireprotocol.c index 9e96d508e9,8f80bbaada..e92bf0b949 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@@ -12,15 -12,15 +12,15 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #include "php.h" -#include "php_globals.h" #include "mysqlnd.h" +#include "mysqlnd_connection.h" +#include "mysqlnd_ps.h" #include "mysqlnd_priv.h" #include "mysqlnd_wireprotocol.h" #include "mysqlnd_statistics.h" diff --cc ext/mysqlnd/mysqlnd_wireprotocol.h index 363f783bdd,9164a64018..234e3c8f08 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@@ -12,11 -12,12 +12,11 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ + #ifndef MYSQLND_WIREPROTOCOL_H #define MYSQLND_WIREPROTOCOL_H diff --cc ext/mysqlnd/php_mysqlnd.c index 193e4767ae,5c8a7d81e9..87e5009183 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@@ -12,14 -12,14 +12,12 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ */ - /* $Id$ */ #include "php.h" -#include "php_ini.h" #include "mysqlnd.h" #include "mysqlnd_priv.h" #include "mysqlnd_debug.h" diff --cc ext/mysqlnd/php_mysqlnd.h index 7ee015e291,6e1f285abc..87e6a75b07 --- a/ext/mysqlnd/php_mysqlnd.h +++ b/ext/mysqlnd/php_mysqlnd.h @@@ -12,12 -12,10 +12,9 @@@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | - | Georg Richter | + | Authors: Andrey Hristov | + | Ulf Wendel | - | Georg Richter | +----------------------------------------------------------------------+ - - $Id$ */ #ifndef PHP_MYSQLND_H