Merge branch 'master' into getimagetype

Author: morsssss

.cirrus.yml

@@ -10,6 +10,7 @@ task:
   install_script:
     #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
     #- pkg upgrade -y
+    - kldload accf_http
     - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
   script:
     - ./buildconf -f

.travis.yml

@@ -69,7 +69,10 @@ env:
 jobs:
     include:
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
-          arch: arm64
+          arch: arm64-graviton2
+          dist: bionic
+          virt: lxd
+          group: edge
           if: type = cron
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
           arch: s390x

NEWS

@@ -1,6 +1,14 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.1.0alpha1
+?? ??? ????, PHP 8.1.0alpha2
+
+- PDO:
+
+. PDO OCI:
+  . Fixed bug #77120 (Support 'success with info' at connection).
+    (Sergei Morozov)
+
+10 Jun 2021, PHP 8.1.0alpha1
 
 - Core:
   . Fixed inclusion order for phpize builds on Windows. (cmb)
@@ -11,6 +19,12 @@ PHP                                                                        NEWS
     the method is private). (Nikita)
   . Implemented FR #77372 (Relative file path is removed from uploaded file).
     (Björn Tantau)
+  . Fixed bug #81076 (incorrect debug info on Closures with implicit binds).
+    (krakjoe)
+ 
+ - Standard:
+  . Fixed bug #77627 (method_exists on Closure::__invoke inconsistency).
+    (krakjoe)
 
 - Date:
   . Fixed bug #52480 (Incorrect difference using DateInterval) (Derick)
@@ -87,6 +101,9 @@ PHP                                                                        NEWS
 - OpenSSL:
   . Bump minimal OpenSSL version to 1.0.2. (Jakub Zelenka)
 
+- PCRE:
+  . Bundled PCRE2 is 10.37.
+
 - PDO:
   . Fixed bug #40913 (PDO_MYSQL: PDO::PARAM_LOB does not bind to a stream for
     fetching a BLOB). (Nikita)
@@ -112,6 +129,9 @@ PHP                                                                        NEWS
   . Convert resource<pspell> to object \PSpell\Dictionary. (Sara)
   . Convert resource<pspell config> to object \PSpell\Config. (Sara)
 
+- readline:
+  . Fixed bug #72998 (invalid read in readline completion). (krakjoe)
+
 - Reflection:
   . Implement ReflectionFunctionAbstract::getClosureUsedVariables (krakjoe)
 

README.md

@@ -14,7 +14,7 @@ web development. Fast, flexible and pragmatic, PHP powers everything from your
 blog to the most popular websites in the world. PHP is distributed under the
 [PHP License v3.01](LICENSE).
 
-[![Build status](https://travis-ci.org/php/php-src.svg?branch=master)](https://travis-ci.org/php/php-src)
+[![Build status](https://travis-ci.com/php/php-src.svg?branch=master)](https://travis-ci.com/php/php-src)
 [![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy/branch/master?svg=true)](https://ci.appveyor.com/project/php/php-src)
 [![Build Status](https://dev.azure.com/phpazuredevops/php/_apis/build/status/php.php-src?branchName=master)](https://dev.azure.com/phpazuredevops/php/_build/latest?definitionId=1&branchName=master)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:php)

TSRM/TSRM.c

@@ -744,10 +744,17 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
 #elif defined(__aarch64__)
 	size_t ret;
 
+# ifdef __APPLE__
+	// Points to struct TLVDecriptor for _tsrm_ls_cache in macOS.
+	asm("adrp %0, #__tsrm_ls_cache@TLVPPAGE\n\t"
+	    "ldr %0, [%0, #__tsrm_ls_cache@TLVPPAGEOFF]"
+	     : "=r" (ret));
+# else
 	asm("mov %0, xzr\n\t"
 	    "add %0, %0, #:tprel_hi12:_tsrm_ls_cache, lsl #12\n\t"
 	    "add %0, %0, #:tprel_lo12_nc:_tsrm_ls_cache"
 	     : "=r" (ret));
+# endif
 	return ret;
 #else
 	return 0;

UPGRADING

@@ -100,6 +100,7 @@ PHP 8.1 UPGRADE NOTES
   . Classes extending mysqli_stmt::execute() will be required to specify the
     additional parameter now.
     RFC: https://wiki.php.net/rfc/mysqli_bind_in_execute
+  . mysqli::connect() will now return true instead of null on success.
 
 - MySQLnd:
   . The mysqlnd.fetch_copy_data ini setting has been removed. However, this
@@ -345,6 +346,9 @@ PHP 8.1 UPGRADE NOTES
   . Added array_is_list(array $array), which will return true if the array keys are 0 .. count($array)-1 in that order.
     RFC: https://wiki.php.net/rfc/is_list
 
+- pcntl:
+  . Added pcntl_rfork for FreeBSD variants
+
 - Reflection:
   . Added ReflectionFunctionAbstract::getClosureUsedVariables
 
@@ -400,6 +404,9 @@ PHP 8.1 UPGRADE NOTES
 - OpenSSL:
   . The OpenSSL extension now requires at least OpenSSL version 1.0.2.
 
+- Sockets:
+  . FreeBSD defines SO_ACCEPTFILTER
+
 - Standard:
   . --with-password-argon2 now uses pkg-config to detect libargon2. As such,
     an alternative libargon2 location should now be specified using
@@ -414,6 +421,9 @@ PHP 8.1 UPGRADE NOTES
     MYSQLI_REFRESH_SLAVE, in line with an upstream change in MySQL. The old
     constant is still available for backwards-compatibility reasons, but may
     be deprecated/removed in the future.
+    
+- Sockets:
+  . TCP_DEFER_ACCEPT socket option added where available.
 
 ========================================
 11. Changes to INI File Handling

UPGRADING.INTERNALS

@@ -13,6 +13,7 @@ PHP 8.1 INTERNALS UPGRADE NOTES
   b. ext/pdo
   c. ext/standard
   d. ext/pgsql
+  e. ext/pcre
 
 ========================
 1. Internal API changes
@@ -22,6 +23,8 @@ PHP 8.1 INTERNALS UPGRADE NOTES
        spl_ce_Stringable, spl_ce_Traversable alias class entries have been removed in favor of zend_ce_aggregate,
        zend_ce_arrayaccess, zend_ce_countable, zend_ce_iterator, zend_ce_serializable, zend_ce_stringable,
        zend_ce_traversable.
+     - The ZVAL_NEW_ARR() macro has been removed. Use array_init() or ZVAL_ARR
+       with zend_new_array() instead.
   b. Zend Stream API has been changed to use "zend_string*" instead of "char*"
       - zend_file_handle.filename now is zend_string*
       - zend_file_handle.free_filename is removed. Now zend_file_handle.filename is always released.
@@ -103,3 +106,7 @@ PHP 8.1 INTERNALS UPGRADE NOTES
     - The functions php_pgsql_meta_data(), php_pgsql_convert(), php_pgsql_insert(),
       php_pgsql_update(), php_pgsql_delete(), and php_pgsql_select() now accept a
       zend_string* instead of a char* for the table name.
+
+  e. ext/pcre
+    - Bundled PCRE2 is at version 10.37. The most important diff to the previous
+      version is the JIT support on the S390 platform.

Zend/Optimizer/compact_literals.c

@@ -319,19 +319,14 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
 
 #if DEBUG_COMPACT_LITERALS
 		{
-			int i, use_copy;
 			fprintf(stderr, "File %s func %s\n", op_array->filename->val,
 					op_array->function_name ? op_array->function_name->val : "main");
 			fprintf(stderr, "Literals table size %d\n", op_array->last_literal);
 
-			for (i = 0; i < op_array->last_literal; i++) {
-				zval zv;
-				ZVAL_COPY_VALUE(&zv, op_array->literals + i);
-				use_copy = zend_make_printable_zval(op_array->literals + i, &zv);
-				fprintf(stderr, "Literal %d, val (%zu):%s\n", i, Z_STRLEN(zv), Z_STRVAL(zv));
-				if (use_copy) {
-					zval_ptr_dtor_nogc(&zv);
-				}
+			for (int i = 0; i < op_array->last_literal; i++) {
+				zend_string *str = zval_get_string(op_array->literals + i);
+				fprintf(stderr, "Literal %d, val (%zu):%s\n", i, ZSTR_LEN(str), ZSTR_VAL(str));
+				zend_string_release(str);
 			}
 			fflush(stderr);
 		}
@@ -845,17 +840,12 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
 
 #if DEBUG_COMPACT_LITERALS
 		{
-			int i, use_copy;
 			fprintf(stderr, "Optimized literals table size %d\n", op_array->last_literal);
 
-			for (i = 0; i < op_array->last_literal; i++) {
-				zval zv;
-				ZVAL_COPY_VALUE(&zv, op_array->literals + i);
-				use_copy = zend_make_printable_zval(op_array->literals + i, &zv);
-				fprintf(stderr, "Literal %d, val (%zu):%s\n", i, Z_STRLEN(zv), Z_STRVAL(zv));
-				if (use_copy) {
-					zval_ptr_dtor_nogc(&zv);
-				}
+			for (int i = 0; i < op_array->last_literal; i++) {
+				zend_string *str = zval_get_string(op_array->literals + i);
+				fprintf(stderr, "Literal %d, val (%zu):%s\n", i, ZSTR_LEN(str), ZSTR_VAL(str));
+				zend_string_release(str);
 			}
 			fflush(stderr);
 		}

Zend/Optimizer/pass1.c

@@ -119,12 +119,12 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 				} else if (opline->extended_value == ZEND_MOD
 				 || opline->extended_value == ZEND_SL
 				 || opline->extended_value == ZEND_SR) {
-					if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_LONG) {
-						/* don't optimize if it should produce a runtime numeric string error */
-						if (!(Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING
-							&& !is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0))) {
-							convert_to_long(&ZEND_OP2_LITERAL(opline));
+					zval *op2 = &ZEND_OP2_LITERAL(opline);
+					if (Z_TYPE_P(op2) != IS_LONG) {
+						if (!zend_is_op_long_compatible(op2)) {
+							break;
 						}
+						convert_to_long(op2);
 					}
 				} else if (opline->extended_value == ZEND_CONCAT) {
 					if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_STRING) {

Zend/Optimizer/sccp.c

@@ -425,9 +425,14 @@ static inline int fetch_array_elem(zval **result, zval *op1, zval *op2) {
 		case IS_LONG:
 			*result = zend_hash_index_find(Z_ARR_P(op1), Z_LVAL_P(op2));
 			return SUCCESS;
-		case IS_DOUBLE:
-			*result = zend_hash_index_find(Z_ARR_P(op1), zend_dval_to_lval(Z_DVAL_P(op2)));
+		case IS_DOUBLE: {
+			zend_long lval = zend_dval_to_lval(Z_DVAL_P(op2));
+			if (!zend_is_long_compatible(Z_DVAL_P(op2), lval)) {
+				return FAILURE;
+			}
+			*result = zend_hash_index_find(Z_ARR_P(op1), lval);
 			return SUCCESS;
+		}
 		case IS_STRING:
 			*result = zend_symtable_find(Z_ARR_P(op1), Z_STR_P(op2));
 			return SUCCESS;
@@ -508,9 +513,14 @@ static inline int ct_eval_del_array_elem(zval *result, zval *key) {
 		case IS_LONG:
 			zend_hash_index_del(Z_ARR_P(result), Z_LVAL_P(key));
 			break;
-		case IS_DOUBLE:
-			zend_hash_index_del(Z_ARR_P(result), zend_dval_to_lval(Z_DVAL_P(key)));
+		case IS_DOUBLE: {
+			zend_long lval = zend_dval_to_lval(Z_DVAL_P(key));
+			if (!zend_is_long_compatible(Z_DVAL_P(key), lval)) {
+				return FAILURE;
+			}
+			zend_hash_index_del(Z_ARR_P(result), lval);
 			break;
+		}
 		case IS_STRING:
 			zend_symtable_del(Z_ARR_P(result), Z_STR_P(key));
 			break;
@@ -548,11 +558,16 @@ static inline int ct_eval_add_array_elem(zval *result, zval *value, zval *key) {
 			SEPARATE_ARRAY(result);
 			value = zend_hash_index_update(Z_ARR_P(result), Z_LVAL_P(key), value);
 			break;
-		case IS_DOUBLE:
+		case IS_DOUBLE: {
+			zend_long lval = zend_dval_to_lval(Z_DVAL_P(key));
+			if (!zend_is_long_compatible(Z_DVAL_P(key), lval)) {
+				return FAILURE;
+			}
 			SEPARATE_ARRAY(result);
 			value = zend_hash_index_update(
-				Z_ARR_P(result), zend_dval_to_lval(Z_DVAL_P(key)), value);
+				Z_ARR_P(result), lval, value);
 			break;
+		}
 		case IS_STRING:
 			SEPARATE_ARRAY(result);
 			value = zend_symtable_update(Z_ARR_P(result), Z_STR_P(key), value);

Zend/Optimizer/zend_func_info.c

@@ -425,7 +425,7 @@ static const func_info_t func_infos[] = {
 	F1("preg_grep",				                MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
 
 	/* ext/mysqli */
-	F1("mysqli_connect",						MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
+	F1("mysqli_connect",						MAY_BE_FALSE | MAY_BE_OBJECT),
 	F0("mysqli_close",							MAY_BE_TRUE),
 	F1("mysqli_connect_error",					MAY_BE_NULL | MAY_BE_STRING),
 	F1("mysqli_get_client_stats",				MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
@@ -451,7 +451,7 @@ static const func_info_t func_infos[] = {
 	F1("mysqli_fetch_field_direct",				MAY_BE_FALSE | MAY_BE_OBJECT),
 	F1("mysqli_fetch_lengths",					MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
 	F1("mysqli_fetch_row",						MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY),
-	F1("mysqli_get_client_info",				MAY_BE_NULL | MAY_BE_STRING),
+	F1("mysqli_get_client_info",				MAY_BE_STRING),
 	F1("mysqli_get_host_info",					MAY_BE_STRING),
 	F1("mysqli_get_server_info",				MAY_BE_STRING),
 	F1("mysqli_info",							MAY_BE_NULL | MAY_BE_STRING),

Zend/Optimizer/zend_inference.c

@@ -2631,9 +2631,6 @@ static zend_always_inline int _zend_update_type_info(
 		case ZEND_PRE_INC:
 		case ZEND_PRE_DEC:
 			tmp = 0;
-			if (t1 & MAY_BE_REF) {
-				tmp |= MAY_BE_REF;
-			}
 			if (t1 & (MAY_BE_RC1|MAY_BE_RCN)) {
 				tmp |= MAY_BE_RC1;
 				if (ssa_op->result_def >= 0) {
@@ -2670,14 +2667,17 @@ static zend_always_inline int _zend_update_type_info(
 				if (t1 & MAY_BE_STRING) {
 					tmp |= MAY_BE_STRING | MAY_BE_LONG | MAY_BE_DOUBLE;
 				}
-				tmp |= t1 & (MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE | MAY_BE_ARRAY | MAY_BE_OBJECT | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_KEY_ANY);
-			}
-			if (ssa_op->op1_def >= 0) {
-				UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
+				tmp |= t1 & (MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_OBJECT);
 			}
 			if (ssa_op->result_def >= 0) {
 				UPDATE_SSA_TYPE(tmp, ssa_op->result_def);
 			}
+			if (ssa_op->op1_def >= 0) {
+				if (t1 & MAY_BE_REF) {
+					tmp |= MAY_BE_REF;
+				}
+				UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
+			}
 			break;
 		case ZEND_POST_INC:
 		case ZEND_POST_DEC:
@@ -4481,7 +4481,6 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 			return (t1 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
 				(t2 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
 		case ZEND_DIV:
-		case ZEND_MOD:
 			if (!OP2_HAS_RANGE() ||
 				(OP2_MIN_RANGE() <= 0 && OP2_MAX_RANGE() >= 0)) {
 				/* Division by zero */
@@ -4493,10 +4492,18 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 		case ZEND_POW:
 			return (t1 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
 				(t2 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
+		/* Ops may throw if not an integer */
+		case ZEND_MOD:
+			if (!OP2_HAS_RANGE() ||
+				(OP2_MIN_RANGE() <= 0 && OP2_MAX_RANGE() >= 0)) {
+				/* Division by zero */
+				return 1;
+			}
+			ZEND_FALLTHROUGH;
 		case ZEND_SL:
 		case ZEND_SR:
-			return (t1 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
-				(t2 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
+			return (t1 & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
+				(t2 & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
 				!OP2_HAS_RANGE() ||
 				OP2_MIN_RANGE() < 0;
 		case ZEND_CONCAT:
@@ -4510,10 +4517,10 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 			 && (t2 & MAY_BE_ANY) == MAY_BE_STRING) {
 				return 0;
 			}
-			return (t1 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
-				(t2 & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
+			return (t1 & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
+				(t2 & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
 		case ZEND_BW_NOT:
-			return (t1 & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
+			return (t1 & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
 		case ZEND_PRE_INC:
 		case ZEND_POST_INC:
 		case ZEND_PRE_DEC: