Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (1132 commits)
  Micro optimizations for isset/empty
  Micro optimization for zend_hash_next_index_insert_new()
  Fix array_keys() on $GLOBALS
  Fix procedural finfo calls in methods
  Fix allocator for 64bit zend_long with 32bit long
  Use intptr_t for zend_intptr_t typedef
  Fix format strings in zend_alloc
  Drop zend_long64 in favor of int64_t
  Removed deprecated fields
  NEWS
  cleanup NEWS
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
  NEWS
  Fixed Bug #65171 imagescale() fails
  Fixed bug #68234
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
index 059cfb2416..5238715987 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.h
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -1,6 +1,6 @@
 /*
   +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
+  | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
   | Copyright (c) 2006-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
@@ -28,7 +28,7 @@
 #define MYSQLND_HEADER_SIZE 4
 #define COMPRESSED_HEADER_SIZE 3
 
-#define MYSQLND_NULL_LENGTH	(php_uint_t) ~0
+#define MYSQLND_NULL_LENGTH	(zend_ulong) ~0
 
 /* Used in mysqlnd_debug.c */
 PHPAPI extern const char mysqlnd_read_header_name[];
@@ -90,20 +90,20 @@ typedef struct st_mysqlnd_packet_greet {
 /* Client authenticates */
 typedef struct st_mysqlnd_packet_auth {
 	MYSQLND_PACKET_HEADER		header;
-	uint32_t	client_flags;
-	uint32_t	max_packet_size;
-	uint8_t		charset_no;
 	const char	*user;
 	const zend_uchar	*auth_data;
 	size_t		auth_data_len;
 	const char	*db;
 	const char	*auth_plugin_name;
+	uint32_t	client_flags;
+	uint32_t	max_packet_size;
+	uint8_t		charset_no;
 	/* Here the packet ends. This is user supplied data */
-	size_t		db_len;
 	zend_bool	send_auth_data;
 	zend_bool	is_change_user_packet;
 	zend_bool	silent;
 	HashTable	*connect_attr;
+	size_t		db_len;
 } MYSQLND_PACKET_AUTH;
 
 /* Auth response packet */
@@ -185,7 +185,7 @@ typedef struct st_mysqlnd_packet_rset_header {
 	  error_no != 0 => error
 	  others => result set -> Read res_field packets up to field_count
 	*/
-	php_uint_t		field_count;
+	zend_ulong		field_count;
 	/*
 	  These are filled if no SELECT query. For SELECT warning_count
 	  and server status are in the last row packet, the EOF packet.
@@ -258,7 +258,7 @@ typedef struct st_mysqlnd_packet_prepare_response {
 	MYSQLND_PACKET_HEADER	header;
 	/* also known as field_count 0x00=OK , 0xFF=error */
 	unsigned char	error_code;
-	php_uint_t	stmt_id;
+	zend_ulong	stmt_id;
 	unsigned int	field_count;
 	unsigned int	param_count;
 	unsigned int	warning_count;
@@ -300,7 +300,7 @@ typedef struct  st_mysqlnd_packet_sha256_pk_request_response {
 
 PHPAPI void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const pass, size_t pass_len);
 
-php_uint_t	php_mysqlnd_net_field_length(zend_uchar **packet);
+zend_ulong	php_mysqlnd_net_field_length(zend_uchar **packet);
 zend_uchar *	php_mysqlnd_net_store_length(zend_uchar *packet, uint64_t length);
 size_t			php_mysqlnd_net_store_length_size(uint64_t length);