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

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 84425950a8..63ccf52370 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1,6 +1,6 @@
 /*
   +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
+  | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
@@ -98,8 +98,8 @@
 		tidy_object_handlers_ ## name.clone_obj = NULL; \
 	}
 
-#define TIDY_TAG_CONST(tag) REGISTER_INT_CONSTANT("TIDY_TAG_" #tag, TidyTag_##tag, CONST_CS | CONST_PERSISTENT)
-#define TIDY_NODE_CONST(name, type) REGISTER_INT_CONSTANT("TIDY_NODETYPE_" #name, TidyNode_##type, CONST_CS | CONST_PERSISTENT)
+#define TIDY_TAG_CONST(tag) REGISTER_LONG_CONSTANT("TIDY_TAG_" #tag, TidyTag_##tag, CONST_CS | CONST_PERSISTENT)
+#define TIDY_NODE_CONST(name, type) REGISTER_LONG_CONSTANT("TIDY_NODETYPE_" #name, TidyNode_##type, CONST_CS | CONST_PERSISTENT)
 
 #ifndef TRUE
 #define TRUE 1
@@ -134,7 +134,7 @@
 #define ADD_PROPERTY_LONG(_table, _key, _long) \
 	{ \
 		zval tmp; \
-		ZVAL_INT(&tmp, _long); \
+		ZVAL_LONG(&tmp, _long); \
 		zend_hash_str_update(_table, #_key, sizeof(#_key) - 1, &tmp); \
 	}
 
@@ -524,21 +524,21 @@ static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value TSRMLS
 			break;
 
 		case TidyInteger:
-			if (Z_TYPE(conv) != IS_INT) {
+			if (Z_TYPE(conv) != IS_LONG) {
 				zval_copy_ctor(&conv);
-				convert_to_int(&conv);
+				convert_to_long(&conv);
 			}
-			if (tidyOptSetInt(doc, tidyOptGetId(opt), Z_IVAL(conv))) {
+			if (tidyOptSetInt(doc, tidyOptGetId(opt), Z_LVAL(conv))) {
 				return SUCCESS;
 			}
 			break;
 
 		case TidyBoolean:
-			if (Z_TYPE(conv) != IS_INT) {
+			if (Z_TYPE(conv) != IS_LONG) {
 				zval_copy_ctor(&conv);
-				convert_to_int(&conv);
+				convert_to_long(&conv);
 			}
-			if (tidyOptSetBool(doc, tidyOptGetId(opt), Z_IVAL(conv))) {
+			if (tidyOptSetBool(doc, tidyOptGetId(opt), Z_LVAL(conv))) {
 				return SUCCESS;
 			}
 			break;
@@ -554,7 +554,7 @@ static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value TSRMLS
 static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_file)
 {
 	char *enc = NULL;
-	int enc_len = 0;
+	size_t enc_len = 0;
 	zend_bool use_include_path = 0;
 	TidyDoc doc;
 	TidyBuffer *errbuf;
@@ -627,7 +627,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil
 	}
 
 	if (is_file) {
-		STR_RELEASE(data);
+		zend_string_release(data);
 	}
 
 	tidyBufFree(errbuf);
@@ -734,8 +734,8 @@ static int tidy_doc_cast_handler(zval *in, zval *out, int type TSRMLS_DC)
 	PHPTidyObj *obj;
 
 	switch (type) {
-		case IS_INT:
-			ZVAL_INT(out, 0);
+		case IS_LONG:
+			ZVAL_LONG(out, 0);
 			break;
 
 		case IS_DOUBLE:
@@ -767,8 +767,8 @@ static int tidy_node_cast_handler(zval *in, zval *out, int type TSRMLS_DC)
 	PHPTidyObj *obj;
 
 	switch(type) {
-		case IS_INT:
-			ZVAL_INT(out, 0);
+		case IS_LONG:
+			ZVAL_LONG(out, 0);
 			break;
 
 		case IS_DOUBLE:
@@ -1080,14 +1080,14 @@ static PHP_INI_MH(php_tidy_set_clean_output)
 	int status;
 	zend_bool value;
 
-	if (new_value_length==2 && strcasecmp("on", new_value)==0) {
+	if (new_value->len==2 && strcasecmp("on", new_value->val)==0) {
 		value = (zend_bool) 1;
-	} else if (new_value_length==3 && strcasecmp("yes", new_value)==0) {
+	} else if (new_value->len==3 && strcasecmp("yes", new_value->val)==0) {
 		value = (zend_bool) 1;
-	} else if (new_value_length==4 && strcasecmp("true", new_value)==0) {
+	} else if (new_value->len==4 && strcasecmp("true", new_value->val)==0) {
 		value = (zend_bool) 1;
 	} else {
-		value = (zend_bool) atoi(new_value);
+		value = (zend_bool) atoi(new_value->val);
 	}
 
 	if (stage == PHP_INI_STAGE_RUNTIME) {
@@ -1103,7 +1103,7 @@ static PHP_INI_MH(php_tidy_set_clean_output)
 		}
 	}
 
-	status = OnUpdateBool(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+	status = OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 
 	if (stage == PHP_INI_STAGE_RUNTIME && value) {
 		if (!php_output_handler_started(ZEND_STRL("ob_tidyhandler") TSRMLS_CC)) {
@@ -1182,7 +1182,7 @@ static int php_tidy_output_handler(void **nothing, php_output_context *output_co
 static PHP_FUNCTION(tidy_parse_string)
 {
 	char *enc = NULL;
-	int enc_len = 0;
+	size_t enc_len = 0;
 	zend_string *input;
 	zval *options = NULL;
 	PHPTidyObj *obj;
@@ -1237,7 +1237,7 @@ static PHP_FUNCTION(tidy_get_output)
 static PHP_FUNCTION(tidy_parse_file)
 {
 	char *enc = NULL;
-	int enc_len = 0;
+	size_t enc_len = 0;
 	zend_bool use_include_path = 0;
 	zend_string *inputfile, *contents;
 	zval *options = NULL;
@@ -1264,7 +1264,7 @@ static PHP_FUNCTION(tidy_parse_file)
 		RETVAL_FALSE;
 	}
 
-	STR_RELEASE(contents);
+	zend_string_release(contents);
 }
 /* }}} */
 
@@ -1334,7 +1334,7 @@ static PHP_FUNCTION(tidy_get_opt_doc)
 {
 	PHPTidyObj *obj;
 	char *optval, *optname;
-	int optname_len;
+	size_t optname_len;
 	TidyOption opt;
 
 	TIDY_SET_CONTEXT;
@@ -1396,11 +1396,11 @@ static PHP_FUNCTION(tidy_get_config)
 				break;
 
 			case TidyInteger:
-				add_assoc_int(return_value, opt_name, (long)opt_value);
+				add_assoc_long(return_value, opt_name, (zend_long)opt_value);
 				break;
 
 			case TidyBoolean:
-				add_assoc_bool(return_value, opt_name, (long)opt_value);
+				add_assoc_bool(return_value, opt_name, (zend_long)opt_value);
 				break;
 		}
 	}
@@ -1415,7 +1415,7 @@ static PHP_FUNCTION(tidy_get_status)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_INT(tidyStatus(obj->ptdoc->doc));
+	RETURN_LONG(tidyStatus(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1425,7 +1425,7 @@ static PHP_FUNCTION(tidy_get_html_ver)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_INT(tidyDetectedHtmlVersion(obj->ptdoc->doc));
+	RETURN_LONG(tidyDetectedHtmlVersion(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1455,7 +1455,7 @@ static PHP_FUNCTION(tidy_error_count)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_INT(tidyErrorCount(obj->ptdoc->doc));
+	RETURN_LONG(tidyErrorCount(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1465,7 +1465,7 @@ static PHP_FUNCTION(tidy_warning_count)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_INT(tidyWarningCount(obj->ptdoc->doc));
+	RETURN_LONG(tidyWarningCount(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1475,7 +1475,7 @@ static PHP_FUNCTION(tidy_access_count)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_INT(tidyAccessWarningCount(obj->ptdoc->doc));
+	RETURN_LONG(tidyAccessWarningCount(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1485,7 +1485,7 @@ static PHP_FUNCTION(tidy_config_count)
 {
 	TIDY_FETCH_OBJECT;
 
-	RETURN_INT(tidyConfigErrorCount(obj->ptdoc->doc));
+	RETURN_LONG(tidyConfigErrorCount(obj->ptdoc->doc));
 }
 /* }}} */
 
@@ -1496,7 +1496,7 @@ static PHP_FUNCTION(tidy_getopt)
 	PHPTidyObj *obj;
 	char *optname;
 	void *optval;
-	int optname_len;
+	size_t optname_len;
 	TidyOption opt;
 	TidyOptionType optt;
 	
@@ -1529,7 +1529,7 @@ static PHP_FUNCTION(tidy_getopt)
 			return;
 
 		case TidyInteger:
-			RETURN_INT((long)optval);
+			RETURN_LONG((zend_long)optval);
 			break;
 
 		case TidyBoolean:
@@ -1552,7 +1552,7 @@ static PHP_FUNCTION(tidy_getopt)
 static TIDY_DOC_METHOD(__construct)
 {
 	char *enc = NULL;
-	int enc_len = 0;
+	size_t enc_len = 0;
 	zend_bool use_include_path = 0;
 	zval *options = NULL;
 	zend_string *contents, *inputfile = NULL;
@@ -1577,14 +1577,14 @@ static TIDY_DOC_METHOD(__construct)
 
 		php_tidy_parse_string(obj, contents->val, contents->len, enc TSRMLS_CC);
 
-		STR_RELEASE(contents);
+		zend_string_release(contents);
 	}
 }
 
 static TIDY_DOC_METHOD(parseFile)
 {
 	char *enc = NULL;
-	int enc_len = 0;
+	size_t enc_len = 0;
 	zend_bool use_include_path = 0;
 	zval *options = NULL;
 	zend_string *inputfile, *contents;
@@ -1612,13 +1612,13 @@ static TIDY_DOC_METHOD(parseFile)
 		RETVAL_TRUE;
 	}
 
-	STR_RELEASE(contents);
+	zend_string_release(contents);
 }
 
 static TIDY_DOC_METHOD(parseString)
 {
 	char *enc = NULL;
-	int enc_len = 0;
+	size_t enc_len = 0;
 	zval *options = NULL;
 	PHPTidyObj *obj;
 	zend_string *input;