]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAndrey Hristov <andrey@php.net>
Wed, 16 Mar 2016 09:47:27 +0000 (10:47 +0100)
committerAndrey Hristov <andrey@php.net>
Wed, 16 Mar 2016 09:47:27 +0000 (10:47 +0100)
39 files changed:
1  2 
ext/mysqlnd/mysqlnd.h
ext/mysqlnd/mysqlnd_alloc.c
ext/mysqlnd/mysqlnd_alloc.h
ext/mysqlnd/mysqlnd_auth.c
ext/mysqlnd/mysqlnd_auth.h
ext/mysqlnd/mysqlnd_block_alloc.c
ext/mysqlnd/mysqlnd_block_alloc.h
ext/mysqlnd/mysqlnd_charset.c
ext/mysqlnd/mysqlnd_commands.h
ext/mysqlnd/mysqlnd_connection.c
ext/mysqlnd/mysqlnd_connection.h
ext/mysqlnd/mysqlnd_debug.c
ext/mysqlnd/mysqlnd_debug.h
ext/mysqlnd/mysqlnd_driver.c
ext/mysqlnd/mysqlnd_enum_n_def.h
ext/mysqlnd/mysqlnd_ext_plugin.c
ext/mysqlnd/mysqlnd_ext_plugin.h
ext/mysqlnd/mysqlnd_libmysql_compat.h
ext/mysqlnd/mysqlnd_loaddata.c
ext/mysqlnd/mysqlnd_net.c
ext/mysqlnd/mysqlnd_plugin.c
ext/mysqlnd/mysqlnd_plugin.h
ext/mysqlnd/mysqlnd_priv.h
ext/mysqlnd/mysqlnd_protocol_frame_codec.h
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_ps_codec.c
ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_result.h
ext/mysqlnd/mysqlnd_result_meta.c
ext/mysqlnd/mysqlnd_result_meta.h
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/mysqlnd_statistics.c
ext/mysqlnd/mysqlnd_statistics.h
ext/mysqlnd/mysqlnd_structs.h
ext/mysqlnd/mysqlnd_vio.h
ext/mysqlnd/mysqlnd_wireprotocol.c
ext/mysqlnd/mysqlnd_wireprotocol.h
ext/mysqlnd/php_mysqlnd.c
ext/mysqlnd/php_mysqlnd.h

Simple merge
index 2a0141c78b8299f0a333ca34fad5f7e147b2c317,fb62a7b138c625bc9352488ad9215c29afb45789..6ee19a8630702f2feb0651bdff2a0af4976cba72
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
--/* $Id: mysqlnd_debug.c 309303 2011-03-16 12:42:59Z andrey $ */
  #include "php.h"
  #include "mysqlnd.h"
  #include "mysqlnd_priv.h"
index 85dfba5d0995349efac0986f4b03ac7ca64075a3,92d144954c4365647afb3c5d3091a295b0e00641..894da77823df93d295b39a8228c663feb050b328
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index 18a842d0087365c6b4f68962b8b14390964c878c,7c9cead8542e87534812bfbbb144ea1b0382bfe4..6cbd3e1149622564a9d8eef82753a90fd92f99ac
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index d7d652e8fd53858454ad529ba8475f05b36a5cf2,0000000000000000000000000000000000000000..db9460df54de54e5cc33bbc7a50481dcaff8e40f
mode 100644,000000..100644
--- /dev/null
@@@ -1,126 -1,0 +1,126 @@@
-   | Authors: Andrey Hristov <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
 +/*
 +  +----------------------------------------------------------------------+
 +  | 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 <andrey@php.net>                             |
++  |          Ulf Wendel <uw@php.net>                                     |
 +  +----------------------------------------------------------------------+
 +*/
 +
 +#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
 + */
index 8729606adeb378916dbd93ccb5d015384a9a6183,9c5f12130bee960a0d5601616b25f25c68cdbd30..60e6f938ef342c76863982084a0b7350cf6b8fcf
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
--/* $Id$ */
--
  #include "php.h"
  #include "mysqlnd.h"
  #include "mysqlnd_block_alloc.h"
index b6d832c9a4ff16dc187cd7c3471bd78f741732a0,2e6a3a2446f02b99afb28ef5ccb3f6e6ad0a98df..54529a0aca13463869d79064acd05626b1cfc92c
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index 85c90ac6a69408e84881212c03a3f21a85b5ef14,1ed35f9a5112067e31a245d836805a7fadfbeff5..c22430ef305a7383696c538af3c3f1590ba72d52
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
+   |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #include "php.h"
 -#include "php_globals.h"
  #include "mysqlnd.h"
  #include "mysqlnd_priv.h"
  #include "mysqlnd_debug.h"
index bca6ea4cc101c26dfbedd5c654d024d2397ce812,0000000000000000000000000000000000000000..0df83a91a70763bb153f49e84ae54dd9a7f60977
mode 100644,000000..100644
--- /dev/null
@@@ -1,34 -1,0 +1,34 @@@
-   | Authors: Andrey Hristov <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
 +/*
 +  +----------------------------------------------------------------------+
 +  | 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 <andrey@php.net>                             |
++  |          Ulf Wendel <uw@php.net>                                     |
 +  +----------------------------------------------------------------------+
 +*/
 +
 +#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
 + */
index 6f350cfd79f3d423279c0e7a6e71f2beafe7c199,cc9da2f0889190c6f0fc378135184041b56194cb..bb582dbf6ac9129036fb3b1054022a5e6055eb89
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index 0668d09d92daf88382cc4007b1a1ec61f9540089,0000000000000000000000000000000000000000..71fca55cebe5a6f6af77357f1e679ef2750b22c0
mode 100644,000000..100644
--- /dev/null
@@@ -1,87 -1,0 +1,87 @@@
-   | Authors: Andrey Hristov <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
 +/*
 +  +----------------------------------------------------------------------+
 +  | 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 <andrey@php.net>                             |
++  |          Ulf Wendel <uw@php.net>                                     |
 +  +----------------------------------------------------------------------+
 +*/
 +
 +#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
 + */
index 1c09d0c56434a9f5024f99b5f1dbac5871f2fdbb,fd74b69684dd9e6458bef900de519a2d473c5304..c343b4560cfac568ee583d2dd16bb938e71e2570
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #include "php.h"
  #include "mysqlnd.h"
  #include "mysqlnd_priv.h"
index 19b1b34ab3a41c22408a969da4dc9e20de3e9ebe,854ab4cb2200006ee1eaafeea7626e5c8c53d28a..c9eced8af32e18c21c5ad30e6fbd250ee002baa5
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #ifndef MYSQLND_DEBUG_H
  #define MYSQLND_DEBUG_H
  
index ad8137bf68ff63d0e862235207be6db523ffce3b,f62b887748b60bdd043e4b8e4d3dadab529b4a15..1cb6d8f35aa2d74c344ade186ecde8c11c5ce0eb
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #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"
Simple merge
index dd55a1ff6e474700f5fafa25eab835edb24d42ad,18873a08b4222009142103c2911d8a7d329b1034..4da47f6921156e5bed722f64e29d1200c8346f6b
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
++  |          Johannes Schlüter <johannes@php.net>                        |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #include "php.h"
  #include "mysqlnd.h"
  #include "mysqlnd_priv.h"
index d2a643d0356a96e90a2bdb86fe82d65cf2a28017,d20868a4a1f5110e89012bc4bb28e95d751a178a..ecab5e8fc639216748b9ef7ad80b3bac408f4e39
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
++  |          Johannes Schlüter <johannes@php.net>                        |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #ifndef MYSQLND_EXT_PLUGIN_H
  #define MYSQLND_EXT_PLUGIN_H
  
index 32d55cbd6e63862cfd4b8b8be4201fe7b95e6c5b,6be504f70fad858a0982e1a9e92fec4e3d69d577..0556ef1d3814ff42e4e0762952e5b0b722a2d8ae
    | 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 <georg@mysql.com>                             |
-   |          Andrey Hristov <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
+   |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
 -
  #ifndef MYSQLND_LIBMYSQL_COMPAT_H
  #define MYSQLND_LIBMYSQL_COMPAT_H
  
index e82a944ff3816343ba4b2f826ba99095b69df2a2,0edffdefaf6e8e38f6ba84be31a6234906c3fd48..14dee737bf0d76bb2818b1123ca9eae75c24b9c8
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
+   |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
 -
  #include "php.h"
 -#include "php_globals.h"
  #include "mysqlnd.h"
  #include "mysqlnd_wireprotocol.h"
  #include "mysqlnd_priv.h"
index bf86a17a08252ea7a428badc34ec2d0f942068de,56c9d30df12aa7f0728ca7f3328326276b147dc9..111a4898d0403dcc56616dcee022c13f07215db9
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index 81dba83fdb41e63130fe00ff9fbc851eb242920e,8ec8162bd4c8af10be1ef1abed1754c73fa4b88d..e4eba190de33b2f769e8e3e1f17fb878ff6a8255
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index 67ec540ddc3f9bf311f4be7525240f2eed383bca,0000000000000000000000000000000000000000..f01c99579af08aadb4735ca4b0e7b44a942fc955
mode 100644,000000..100644
--- /dev/null
@@@ -1,40 -1,0 +1,41 @@@
-   | Authors: Andrey Hristov <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
 +/*
 +  +----------------------------------------------------------------------+
 +  | 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 <andrey@php.net>                             |
++  |          Ulf Wendel <uw@php.net>                                     |
 +  +----------------------------------------------------------------------+
 +*/
++
 +#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
 + */
index 3e8b437cb129b4f09dce262bdc1b43595d001cff,82260c66c13a95365677c4b232b53d35f5d553ce..cea1bc68c7ff2c9b64f97abcc2740561fa020e7f
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #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);
index 95a943cae1914bf6c1cf977881ac3b7ab879ca29,0000000000000000000000000000000000000000..b00d0c5b08cb92f9327a5aeb460ea484901c744d
mode 100644,000000..100644
--- /dev/null
@@@ -1,35 -1,0 +1,35 @@@
-   | Authors: Andrey Hristov <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
 +/*
 +  +----------------------------------------------------------------------+
 +  | 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 <andrey@php.net>                             |
++  |          Ulf Wendel <uw@php.net>                                     |
 +  +----------------------------------------------------------------------+
 +*/
 +
 +#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
 + */
index 1e37f79bf46493cf2e551861f95933b9bf6f99ea,7053ebe8e74cec266636861096b58076fd33965b..4c3ee8b2a45287db147e5e38c6c0f13ce3db86d0
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #include "php.h"
  #include "mysqlnd.h"
  #include "mysqlnd_wireprotocol.h"
index 081483d8357063f279b08dd934339c60fd817bb7,e0b6c5630faa486cd40dd1a8b5aad4d0344a4c57..d989101060c1ae8d9559e28359e79892fe71926a
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index d649efcbb9a26535723a3097f34988bde55271fe,84985f1992c4e86715c5982945030d8cd951a3a4..fa80ca1ca64f232ea0c025fdbaac7e5364adfe1a
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #include "php.h"
  #include "mysqlnd.h"
  #include "mysqlnd_wireprotocol.h"
index aeda4a218fa41ae60221ec95d3acffba4a244ea5,3351b9eae04ae5706cc294f386b0d8d24f01f7f8..3f91195b32a6b78426134c9194c8d036a5074f9f
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #ifndef MYSQLND_RESULT_H
  #define MYSQLND_RESULT_H
  
index 834073de13a5beac71e89986b205581cc050fb70,49954ead86c0b158fba88efe9942f5d3d486d667..3934edd03eee7ad8c23d6eb116f3b67e4586a269
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #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"
index 6fc5d07a4451d1dc248d0e45d63c4ff555e59f7b,d877d086f0ba360f410b82f8f26656741fb8562d..4f22dc8a8f528faf1e851e77ebb55023e0fd5a72
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
++  |          Johannes Schlüter <johannes@php.net>                        |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index edcf833f91078750afebdbab42f6f9ce08572d59,753cbf9eff4e5015309fb4a8b6366d9b54e1ed30..3ac3ff8ff25fb13715820fbb85f668d96bcb2740
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
++  |          Johannes Schlüter <johannes@php.net>                        |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
Simple merge
index 1c0e5fe042cb18d417b229fbb0e50d86f53ab7a0,2dde6e94c270488d874dc77a95443f335a22f21d..ea909fcfcbecc5651c20d549eda8b3c5998846ac
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #ifndef MYSQLND_STATISTICS_H
  #define MYSQLND_STATISTICS_H
  
index 4832cb1381cd0da17150f70acf97971da67aea3e,c31978448141bf8b86d6933733463189f28910c6..3f2642560407c174e5d3c352d2c9e6459f202b7c
@@@ -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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
index 5b410bf49e3d414cd13df0f573b9c714a63718b6,a137b2a32728426c4eceb142e9ab9d5b05dff416..bb773516b8d681fdda916dce4e5fef62afe6b4c3
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
 -#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:
index 9e96d508e9e40c52e91bbd1ea75b183ca6a3e412,8f80bbaada1c20ab366d1194399864740940139a..e92bf0b9499bacaec4d9c8138e8eea7ea7f3f996
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #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"
index 363f783bdd5fa1b17fea0cf3f65879f9a0787949,9164a640182459ccbe3a4f04d3c453bbe0271211..234e3c8f0885f89683292991837a31db8b7fbb24
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  #ifndef MYSQLND_WIREPROTOCOL_H
  #define MYSQLND_WIREPROTOCOL_H
  
index 193e4767ae2db4077b2929f9e3916adba17e101a,5c8a7d81e96f26c923577866c086871967203e8e..87e50091837e500e8ad62c9676aad28556d839b0
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
  */
  
- /* $Id$ */
  #include "php.h"
 -#include "php_ini.h"
  #include "mysqlnd.h"
  #include "mysqlnd_priv.h"
  #include "mysqlnd_debug.h"
index 7ee015e291ea0d994ce32241c16d901175c6f211,6e1f285abc52c2a561fcea05b1e4472f91364365..87e6a75b071d044d011833e496bebd1f7944edab
    | 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 <andrey@mysql.com>                           |
-   |          Ulf Wendel <uwendel@mysql.com>                              |
-   |          Georg Richter <georg@mysql.com>                             |
+   | Authors: Andrey Hristov <andrey@php.net>                             |
+   |          Ulf Wendel <uw@php.net>                                     |
 -  |          Georg Richter <georg@php.net>                               |
    +----------------------------------------------------------------------+
-   $Id$
  */
  
  #ifndef PHP_MYSQLND_H