Skip to content

Commit 3a33ee6

Browse files
faizshukrifaizshukri
committed
Merge branch 'PHP-7.0'
2 parents d45f478 + f2ab731 commit 3a33ee6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+119
-127
lines changed

‎ext/mysqli/mysqli_mysqlnd.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Georg Richter <georg@mysql.com> |
16-
| Andrey Hristov <andrey@mysql.com> |
17-
| Ulf Wendel <[email protected]> |
15+
| Authors: Georg Richter <georg@php.net> |
16+
| Andrey Hristov <andrey@php.net> |
17+
| Ulf Wendel <[email protected]> |
1818
+----------------------------------------------------------------------+
1919
2020
*/

‎ext/mysqlnd/mysqlnd.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <georg@mysql.com> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
17+
| Georg Richter <georg@php.net> |
1818
+----------------------------------------------------------------------+
1919
*/
20-
/* $Id$ */
2120

2221
#ifndef MYSQLND_H
2322
#define MYSQLND_H

‎ext/mysqlnd/mysqlnd_alloc.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
1919

20-
/* $Id: mysqlnd_debug.c 309303 2011-03-16 12:42:59Z andrey $ */
2120
#include "php.h"
2221
#include "mysqlnd.h"
2322
#include "mysqlnd_priv.h"

‎ext/mysqlnd/mysqlnd_alloc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
1919

‎ext/mysqlnd/mysqlnd_auth.c

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <[email protected]> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <[email protected]> |
15+
| Authors: Andrey Hristov <[email protected]> |
16+
| Ulf Wendel <[email protected]> |
1817
+----------------------------------------------------------------------+
1918
*/
2019

@@ -597,7 +596,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_native_auth_plugin =
597596
MYSQLND_VERSION_ID,
598597
PHP_MYSQLND_VERSION,
599598
"PHP License 3.01",
600-
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <[email protected]>, Georg Richter <[email protected]>",
599+
"Andrey Hristov <andrey@php.net>, Ulf Wendel <[email protected]>, Georg Richter <[email protected]>",
601600
{
602601
NULL, /* no statistics , will be filled later if there are some */
603602
NULL, /* no statistics */
@@ -830,7 +829,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_sha256_authentication_plu
830829
MYSQLND_VERSION_ID,
831830
PHP_MYSQLND_VERSION,
832831
"PHP License 3.01",
833-
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <[email protected]>",
832+
"Andrey Hristov <andrey@php.net>, Ulf Wendel <[email protected]>",
834833
{
835834
NULL, /* no statistics , will be filled later if there are some */
836835
NULL, /* no statistics */

‎ext/mysqlnd/mysqlnd_auth.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
1919

‎ext/mysqlnd/mysqlnd_block_alloc.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
1919

20-
/* $Id$ */
21-
2220
#include "php.h"
2321
#include "mysqlnd.h"
2422
#include "mysqlnd_block_alloc.h"

‎ext/mysqlnd/mysqlnd_block_alloc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
1919

‎ext/mysqlnd/mysqlnd_charset.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <georg@mysql.com> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
17+
| Georg Richter <georg@php.net> |
1818
+----------------------------------------------------------------------+
1919
*/
20+
2021
#include "php.h"
2122
#include "mysqlnd.h"
2223
#include "mysqlnd_priv.h"

‎ext/mysqlnd/mysqlnd_charset.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <georg@mysql.com> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
17+
| Georg Richter <georg@php.net> |
1818
+----------------------------------------------------------------------+
1919
*/
20+
2021
#ifndef MYSQLND_CHARSET_H
2122
#define MYSQLND_CHARSET_H
2223

‎ext/mysqlnd/mysqlnd_commands.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
1919

‎ext/mysqlnd/mysqlnd_connection.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <[email protected]> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <[email protected]> |
15+
| Authors: Andrey Hristov <[email protected]> |
16+
| Ulf Wendel <[email protected]> |
1817
+----------------------------------------------------------------------+
1918
*/
2019

‎ext/mysqlnd/mysqlnd_connection.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
1919

‎ext/mysqlnd/mysqlnd_debug.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
19+
1920
#include "php.h"
2021
#include "mysqlnd.h"
2122
#include "mysqlnd_priv.h"

‎ext/mysqlnd/mysqlnd_debug.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
19+
1920
#ifndef MYSQLND_DEBUG_H
2021
#define MYSQLND_DEBUG_H
2122

‎ext/mysqlnd/mysqlnd_driver.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <[email protected]> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <[email protected]> |
15+
| Authors: Andrey Hristov <[email protected]> |
16+
| Ulf Wendel <[email protected]> |
1817
+----------------------------------------------------------------------+
1918
*/
19+
2020
#include "php.h"
2121
#include "mysqlnd.h"
2222
#include "mysqlnd_vio.h"

‎ext/mysqlnd/mysqlnd_enum_n_def.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <georg@mysql.com> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
17+
| Georg Richter <georg@php.net> |
1818
+----------------------------------------------------------------------+
1919
*/
2020

‎ext/mysqlnd/mysqlnd_ext_plugin.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <[email protected]> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <[email protected]> |
16+
| Johannes Schlüter <[email protected]> |
17+
| Ulf Wendel <[email protected]> |
1718
+----------------------------------------------------------------------+
1819
*/
20+
1921
#include "php.h"
2022
#include "mysqlnd.h"
2123
#include "mysqlnd_priv.h"

‎ext/mysqlnd/mysqlnd_ext_plugin.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <[email protected]> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <[email protected]> |
16+
| Johannes Schlüter <[email protected]> |
17+
| Ulf Wendel <[email protected]> |
1718
+----------------------------------------------------------------------+
1819
*/
20+
1921
#ifndef MYSQLND_EXT_PLUGIN_H
2022
#define MYSQLND_EXT_PLUGIN_H
2123

‎ext/mysqlnd/mysqlnd_libmysql_compat.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Georg Richter <[email protected]> |
16-
| Andrey Hristov <[email protected]> |
17-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <[email protected]> |
16+
| Ulf Wendel <[email protected]> |
17+
| Georg Richter <[email protected]> |
1818
+----------------------------------------------------------------------+
19-
2019
*/
2120
#ifndef MYSQLND_LIBMYSQL_COMPAT_H
2221
#define MYSQLND_LIBMYSQL_COMPAT_H

‎ext/mysqlnd/mysqlnd_loaddata.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <georg@mysql.com> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
17+
| Georg Richter <georg@php.net> |
1818
+----------------------------------------------------------------------+
1919
*/
2020
#include "php.h"

‎ext/mysqlnd/mysqlnd_net.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <[email protected]> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <[email protected]> |
15+
| Authors: Andrey Hristov <[email protected]> |
16+
| Ulf Wendel <[email protected]> |
1817
+----------------------------------------------------------------------+
1918
*/
2019

21-
/* $Id: mysqlnd_ps.c 316906 2011-09-17 10:24:18Z pajoye $ */
2220
#include "php.h"
2321
#include "php_globals.h"
2422
#include "mysqlnd.h"

‎ext/mysqlnd/mysqlnd_plugin.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*
12
/*
23
+----------------------------------------------------------------------+
34
| PHP Version 7 |
@@ -12,13 +13,11 @@
1213
| obtain it through the world-wide-web, please send a note to |
1314
| [email protected] so we can mail you a copy immediately. |
1415
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <[email protected]> |
16-
| Ulf Wendel <[email protected]> |
17-
| Georg Richter <[email protected]> |
16+
| Authors: Andrey Hristov <[email protected]> |
17+
| Ulf Wendel <[email protected]> |
1818
+----------------------------------------------------------------------+
1919
*/
2020

21-
/* $Id: mysqlnd.c 306407 2010-12-16 12:56:19Z andrey $ */
2221
#include "php.h"
2322
#include "mysqlnd.h"
2423
#include "mysqlnd_priv.h"

‎ext/mysqlnd/mysqlnd_plugin.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
19+
1920
#ifndef MYSQLND_PLUGIN_H
2021
#define MYSQLND_PLUGIN_H
2122

‎ext/mysqlnd/mysqlnd_portability.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This file is public domain and comes with NO WARRANTY of any kind */
55
Parts of the original, which are not applicable to mysqlnd have been removed.
66
77
With small modifications, mostly casting but adding few more macros by
8-
Andrey Hristov <andrey@mysql.com> . The additions are in the public domain and
8+
Andrey Hristov <andrey@php.net> . The additions are in the public domain and
99
were added to improve the header file, to get it more consistent.
1010
*/
1111

‎ext/mysqlnd/mysqlnd_priv.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Authors: Andrey Hristov <andrey@mysql.com> |
16-
| Ulf Wendel <[email protected]> |
15+
| Authors: Andrey Hristov <andrey@php.net> |
16+
| Ulf Wendel <[email protected]> |
1717
+----------------------------------------------------------------------+
1818
*/
19+
1920
#ifndef MYSQLND_PRIV_H
2021
#define MYSQLND_PRIV_H
2122
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_object_factory);

0 commit comments

Comments
 (0)