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, 23 insertions, 23 deletions

diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index fe0c794d1d..d43a31be11 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -35,7 +35,7 @@
 
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
@@ -316,8 +316,8 @@ PHP_MINFO_FUNCTION(xmlrpc)
  */
 #if 0
 static int add_long(zval* list, char* id, int num) {
-	if(id) return add_assoc_int(list, id, num);
-	else   return add_next_index_int(list, num);
+	if(id) return add_assoc_long(list, id, num);
+	else   return add_next_index_long(list, num);
 }
 
 static int add_double(zval* list, char* id, double num) {
@@ -342,7 +342,7 @@ static void add_zval(zval* list, const char* id, zval* val)
 	if (list && val) {
 		if (id) {
 			int id_len = strlen(id);
-			if (!(id_len > 1 && id[0] == '0') && is_numeric_string((char *)id, id_len, NULL, NULL, 0) == IS_INT) {
+			if (!(id_len > 1 && id[0] == '0') && is_numeric_string((char *)id, id_len, NULL, NULL, 0) == IS_LONG) {
 				long index = strtol(id, NULL, 0);
 				zend_hash_index_update(Z_ARRVAL_P(list), index, val);
 			} else {
@@ -472,7 +472,7 @@ static void set_output_options(php_output_options* options, zval* output_opts)
 static XMLRPC_VECTOR_TYPE determine_vector_type (HashTable *ht)
 {
 	int bArray = 0, bStruct = 0, bMixed = 0;
-	unsigned long num_index, last_num = 0;
+	zend_ulong num_index, last_num = 0;
 	zend_string* my_key;
 
 	ZEND_HASH_FOREACH_KEY(ht, num_index, my_key) {
@@ -516,7 +516,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep
 						xReturn = XMLRPC_CreateValueEmpty();
 						XMLRPC_SetValueID(xReturn, key, 0);
 					} else {
-						xReturn = XMLRPC_CreateValueBase64(key, Z_STRVAL(val), Z_STRSIZE(val));
+						xReturn = XMLRPC_CreateValueBase64(key, Z_STRVAL(val), Z_STRLEN(val));
 					}
 					break;
 				case xmlrpc_datetime:
@@ -528,8 +528,8 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep
 					xReturn = XMLRPC_CreateValueBoolean(key, Z_TYPE(val) == IS_TRUE);
 					break;
 				case xmlrpc_int:
-					convert_to_int(&val);
-					xReturn = XMLRPC_CreateValueInt(key, Z_IVAL(val));
+					convert_to_long(&val);
+					xReturn = XMLRPC_CreateValueInt(key, Z_LVAL(val));
 					break;
 				case xmlrpc_double:
 					convert_to_double(&val);
@@ -537,11 +537,11 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep
 					break;
 				case xmlrpc_string:
 					convert_to_string(&val);
-					xReturn = XMLRPC_CreateValueString(key, Z_STRVAL(val), Z_STRSIZE(val));
+					xReturn = XMLRPC_CreateValueString(key, Z_STRVAL(val), Z_STRLEN(val));
 					break;
 				case xmlrpc_vector:
 					{
-						unsigned long num_index;
+						zend_ulong num_index;
 						zval* pIter;
 						zend_string* my_key;
 						HashTable *ht = NULL;
@@ -618,7 +618,7 @@ static void XMLRPC_to_PHP(XMLRPC_VALUE el, zval *elem)
 				}
 				break;
 			case xmlrpc_int:
-				ZVAL_INT(elem, XMLRPC_GetValueInt(el));
+				ZVAL_LONG(elem, XMLRPC_GetValueInt(el));
 				break;
 			case xmlrpc_boolean:
 				ZVAL_BOOL(elem, XMLRPC_GetValueBoolean(el));
@@ -666,7 +666,7 @@ PHP_FUNCTION(xmlrpc_encode_request)
 	char *outBuf;
 	zval *vals, *out_opts = NULL;
 	char *method = NULL;
-	int method_len;
+	size_t method_len;
 	php_output_options out;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!z|a", &method, &method_len, &vals, &out_opts) == FAILURE) {
@@ -775,7 +775,7 @@ PHP_FUNCTION(xmlrpc_decode_request)
 {
 	char *xml, *encoding = NULL;
 	zval *method;
-	int xml_len, encoding_len = 0;
+	size_t xml_len, encoding_len = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/|s", &xml, &xml_len, &method, &encoding, &encoding_len) == FAILURE) {
 		return;
@@ -792,7 +792,7 @@ PHP_FUNCTION(xmlrpc_decode_request)
 PHP_FUNCTION(xmlrpc_decode)
 {
 	char *arg1, *arg2 = NULL;
-	int arg1_len, arg2_len = 0;
+	size_t arg1_len, arg2_len = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &arg1, &arg1_len, &arg2, &arg2_len) == FAILURE) {
 		return;
@@ -945,7 +945,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
 		} else {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid callback '%s' passed", php_function_name->val);
 		}
-		STR_RELEASE(php_function_name);
+		zend_string_release(php_function_name);
 	} ZEND_HASH_FOREACH_END();
 	
 	/* so we don't call the same callbacks ever again */
@@ -958,7 +958,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
 PHP_FUNCTION(xmlrpc_server_register_method)
 {
 	char *method_key;
-	int method_key_len;
+	size_t method_key_len;
 	zval *handle, *method_name;
 	xmlrpc_server_data* server;
 
@@ -1020,7 +1020,7 @@ PHP_FUNCTION(xmlrpc_server_call_method)
 	xmlrpc_server_data* server;
 	zval *caller_params, *handle, *output_opts = NULL;
 	char *rawxml;
-	int rawxml_len;
+	size_t rawxml_len;
 	php_output_options out;
 	int argc = ZEND_NUM_ARGS();
 	
@@ -1130,9 +1130,9 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data)
 	if (xDesc) {
 		int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc);
 		XMLRPC_CleanupValue(xDesc);
-		RETURN_INT(retval);
+		RETURN_LONG(retval);
 	}
-	RETURN_INT(0);
+	RETURN_LONG(0);
 }
 /* }}} */
 
@@ -1141,7 +1141,7 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data)
 PHP_FUNCTION(xmlrpc_parse_method_descriptions)
 {
 	char *arg1;
-	int arg1_len;
+	size_t arg1_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg1, &arg1_len) == FAILURE) {
 		return;
@@ -1276,7 +1276,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype) /* {{{ */
 					if (timestamp != -1) {
 						zval ztimestamp;
 
-						ZVAL_INT(&ztimestamp, timestamp);
+						ZVAL_LONG(&ztimestamp, timestamp);
 
 						convert_to_object(value);
 						if (zend_hash_str_update(Z_OBJPROP_P(value), OBJECT_TYPE_ATTR, sizeof(OBJECT_TYPE_ATTR) - 1, &type)) {
@@ -1321,7 +1321,7 @@ XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(zval* value, zval* newvalue) /* {{{ */
 #else
 			case IS_BOOL:
 #endif
-			case IS_INT:
+			case IS_LONG:
 			case IS_RESOURCE:
 				type = xmlrpc_int;
 				break;
@@ -1375,7 +1375,7 @@ PHP_FUNCTION(xmlrpc_set_type)
 {
 	zval *arg;
 	char *type;
-	int type_len;
+	size_t type_len;
 	XMLRPC_VALUE_TYPE vtype;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/s", &arg, &type, &type_len) == FAILURE) {