Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6: (131 commits)
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  See bug #67635
  NEWS
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
  Improve fix for #66608
  Fixed segfault with empty break
  New added opcodes don't need to be resloved
  Update NEWS
  Update NEWS
  Update NEWS
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
  implemented copy libs of core exts in phpize mode
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
  Update NEWS
  Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
  Enable build without atoll (e.g old AIX flavours)
  ...

Conflicts:
	Zend/zend_opcode.c
	ext/date/php_date.c
	ext/mysqli/mysqli.c
	ext/pgsql/pgsql.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/standard/http_fopen_wrapper.c
	ext/standard/string.c
	sapi/litespeed/lsapi_main.c

1 files changed, 35 insertions, 32 deletions

diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
index e1fc5f8f01..3212c778a8 100644
--- a/ext/mysqlnd/mysqlnd_enum_n_def.h
+++ b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -100,7 +100,9 @@
 #define CLIENT_CONNECT_ATTRS		(1UL << 20) /* Client supports connection attributes */
 #define CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA	(1UL << 21) /* Enable authentication response packet to be larger than 255 bytes. */
 #define CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS		(1UL << 22) /* Don't close the connection for a connection with expired password. */
-#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
+#define CLIENT_SESSION_TRACK					(1UL << 23) /* Extended OK */
+#define CLIENT_SSL_VERIFY_SERVER_CERT	(1UL << 30)
+#define CLIENT_REMEMBER_OPTIONS			(1UL << 31)
 
 #define MYSQLND_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | \
 				CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | \
@@ -214,23 +216,23 @@ typedef enum mysqlnd_protocol_type
 
 typedef enum mysqlnd_field_types
 {
-	MYSQL_TYPE_DECIMAL,
-	MYSQL_TYPE_TINY,
-	MYSQL_TYPE_SHORT,
-	MYSQL_TYPE_LONG,
-	MYSQL_TYPE_FLOAT,
-	MYSQL_TYPE_DOUBLE,
-	MYSQL_TYPE_NULL,
-	MYSQL_TYPE_TIMESTAMP,
-	MYSQL_TYPE_LONGLONG,
-	MYSQL_TYPE_INT24,
-	MYSQL_TYPE_DATE,
-	MYSQL_TYPE_TIME,
-	MYSQL_TYPE_DATETIME,
-	MYSQL_TYPE_YEAR,
-	MYSQL_TYPE_NEWDATE,
-	MYSQL_TYPE_VARCHAR,
-	MYSQL_TYPE_BIT,
+	MYSQL_TYPE_DECIMAL	= 0,
+	MYSQL_TYPE_TINY		= 1,
+	MYSQL_TYPE_SHORT	= 2,
+	MYSQL_TYPE_LONG		= 3,
+	MYSQL_TYPE_FLOAT	= 4,
+	MYSQL_TYPE_DOUBLE	= 5,
+	MYSQL_TYPE_NULL		= 6,
+	MYSQL_TYPE_TIMESTAMP= 7,
+	MYSQL_TYPE_LONGLONG	= 8,
+	MYSQL_TYPE_INT24	= 9,
+	MYSQL_TYPE_DATE		= 10,
+	MYSQL_TYPE_TIME		= 11,
+	MYSQL_TYPE_DATETIME	= 12,
+	MYSQL_TYPE_YEAR		= 13,
+	MYSQL_TYPE_NEWDATE	= 14,
+	MYSQL_TYPE_VARCHAR	= 15,
+	MYSQL_TYPE_BIT		= 16,
 	MYSQL_TYPE_NEWDECIMAL=246,
 	MYSQL_TYPE_ENUM=247,
 	MYSQL_TYPE_SET=248,
@@ -322,23 +324,23 @@ typedef enum mysqlnd_server_option
 typedef enum mysqlnd_connection_state
 {
 	CONN_ALLOCED = 0,
-	CONN_READY,
-	CONN_QUERY_SENT,
-	CONN_SENDING_LOAD_DATA,
-	CONN_FETCHING_DATA,
-	CONN_NEXT_RESULT_PENDING,
-	CONN_QUIT_SENT /* object is "destroyed" at this stage */
+	CONN_READY = 1,
+	CONN_QUERY_SENT = 2,
+	CONN_SENDING_LOAD_DATA = 3,
+	CONN_FETCHING_DATA = 4,
+	CONN_NEXT_RESULT_PENDING = 5,
+	CONN_QUIT_SENT = 6 /* object is "destroyed" at this stage */
 } enum_mysqlnd_connection_state;
 
 
 typedef enum mysqlnd_stmt_state
 {
 	MYSQLND_STMT_INITTED = 0,
-	MYSQLND_STMT_PREPARED,
-	MYSQLND_STMT_EXECUTED,
-	MYSQLND_STMT_WAITING_USE_OR_STORE,
-	MYSQLND_STMT_USE_OR_STORE_CALLED,
-	MYSQLND_STMT_USER_FETCHING /* fetch_row_buff or fetch_row_unbuf */
+	MYSQLND_STMT_PREPARED = 1,
+	MYSQLND_STMT_EXECUTED = 2,
+	MYSQLND_STMT_WAITING_USE_OR_STORE = 3,
+	MYSQLND_STMT_USE_OR_STORE_CALLED = 4,
+	MYSQLND_STMT_USER_FETCHING = 5/* fetch_row_buff or fetch_row_unbuf */
 } enum_mysqlnd_stmt_state;
 
 
@@ -596,9 +598,10 @@ enum php_mysqlnd_server_command
 	COM_STMT_RESET = 26,
 	COM_SET_OPTION = 27,
 	COM_STMT_FETCH = 28,
-	COM_DAEMON,
-	COM_BINLOG_DUMP_GTID,
-	COM_RESET_CONNECTION,
+	COM_DAEMON = 29,
+	COM_BINLOG_DUMP_GTID = 30,
+	COM_RESET_CONNECTION = 31,
+	COM_STMT_EXECUTE_BATCH = 32,
 	COM_END
 };