Merge branch 'master' into jsond

Author: bukka

NEWS

@@ -63,6 +63,10 @@
 - Mcrypt:
   . Fixed possible read after end of buffer and use after free. (Dmitry)
 
+- Opcache:
+  . Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8
+    + Opcache). (Laruence)
+
 - pcntl:
   . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
     when setting SIG_DFL). (Julien)

TSRM/TSRM.h

@@ -20,6 +20,8 @@
 # include <tsrm_config.h>
 #endif
 
+#include "main/php_stdint.h"
+
 #ifdef TSRM_WIN32
 #	ifdef TSRM_EXPORTS
 #		define TSRM_API __declspec(dllexport)
@@ -32,13 +34,8 @@
 #	define TSRM_API
 #endif
 
-#ifdef _WIN64
-typedef __int64 tsrm_intptr_t;
-typedef unsigned __int64 tsrm_uintptr_t;
-#else
-typedef long tsrm_intptr_t;
-typedef unsigned long tsrm_uintptr_t;
-#endif
+typedef intptr_t tsrm_intptr_t;
+typedef uintptr_t tsrm_uintptr_t;
 
 /* Only compile multi-threading functions if we're in ZTS mode */
 #ifdef ZTS

UPGRADING

@@ -51,6 +51,7 @@ PHP X.Y UPGRADE NOTES
     and heredocs means that \u{ followed by an invalid sequence will now error.
     However, \u without a following { is unaffected, so "\u202e" won't error and
     will work the same as before.
+  . zend_function.common.num_args don't include the variadic argument anymore.
 
 - DBA
   . dba_delete() now returns false if the key was not found for the inifile

Zend/acinclude.m4

@@ -9,7 +9,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
   # non-working versions, e.g. "3.0 3.2";
   # remove "none" when introducing the first incompatible bison version an 
   # separate any following additions by spaces
-  bison_version_exclude="3.0"
+  bison_version_exclude=""
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

Zend/zend.c

@@ -95,7 +95,7 @@ static ZEND_INI_MH(OnUpdateScriptEncoding) /* {{{ */
 	if (!zend_multibyte_get_functions()) {
 		return SUCCESS;
 	}
-	return zend_multibyte_set_script_encoding_by_string(new_value->val, new_value->len);
+	return zend_multibyte_set_script_encoding_by_string(new_value ? new_value->val : NULL, new_value ? new_value->len : 0);
 }
 /* }}} */
 

Zend/zend_API.c

@@ -2206,6 +2206,8 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
 			}
 			if (ptr->arg_info[ptr->num_args].is_variadic) {
 				internal_function->fn_flags |= ZEND_ACC_VARIADIC;
+				/* Don't count the variadic argument */
+				internal_function->num_args--;
 			}
 		} else {
 			internal_function->arg_info = NULL;
@@ -2760,6 +2762,8 @@ ZEND_API int zend_disable_function(char *function_name, size_t function_name_len
 {
 	zend_internal_function *func;
 	if ((func = zend_hash_str_find_ptr(CG(function_table), function_name, function_name_length))) {
+	    func->fn_flags &= ~(ZEND_ACC_VARIADIC | ZEND_ACC_HAS_TYPE_HINTS);
+		func->num_args = 0;
 		func->arg_info = NULL;
 		func->handler = ZEND_FN(display_disabled_function);
 		return SUCCESS;
@@ -2986,8 +2990,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 		return 0;
 	}
 
-	lmname = zend_string_alloc(mlen, 0);
-	zend_str_tolower_copy(lmname->val, mname->val, mlen);
+	lmname = zend_string_tolower(mname);
 	if (strict_class &&
 	    fcc->calling_scope &&
 		zend_string_equals_literal(lmname, ZEND_CONSTRUCTOR_FUNC_NAME)) {
@@ -3152,7 +3155,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 			if (error) zend_spprintf(error, 0, "function '%s' does not exist", mname->val);
 		}
 	}
-	zend_string_free(lmname);
+	zend_string_release(lmname);
 	zend_string_release(mname);
 
 	if (fcc->object) {

Zend/zend_API.h

@@ -610,8 +610,8 @@ END_EXTERN_C()
 #define RETVAL_RES(r)			 		ZVAL_RES(return_value, r)
 #define RETVAL_OBJ(r)			 		ZVAL_OBJ(return_value, r)
 #define RETVAL_ZVAL(zv, copy, dtor)		ZVAL_ZVAL(return_value, zv, copy, dtor)
-#define RETVAL_FALSE  					ZVAL_BOOL(return_value, 0)
-#define RETVAL_TRUE   					ZVAL_BOOL(return_value, 1)
+#define RETVAL_FALSE  					ZVAL_FALSE(return_value)
+#define RETVAL_TRUE   					ZVAL_TRUE(return_value)
 
 #define RETURN_BOOL(b) 					{ RETVAL_BOOL(b); return; }
 #define RETURN_NULL() 					{ RETVAL_NULL(); return;}

Zend/zend_ast.c

@@ -262,14 +262,14 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s
 				ZVAL_BOOL(result, zend_is_true(&op2));
 				zval_dtor(&op2);
 			} else {
-				ZVAL_BOOL(result, 0);
+				ZVAL_FALSE(result);
 			}
 			zval_dtor(&op1);
 			break;
 		case ZEND_AST_OR:
 			zend_ast_evaluate(&op1, ast->child[0], scope);
 			if (zend_is_true(&op1)) {
-				ZVAL_BOOL(result, 1);
+				ZVAL_TRUE(result);
 			} else {
 				zend_ast_evaluate(&op2, ast->child[1], scope);
 				ZVAL_BOOL(result, zend_is_true(&op2));