Merge remote-tracking branch 'upstream/master' into random_class

Author: zeriyoshi

NEWS

@@ -2,7 +2,16 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.0alpha3
 
+- Core:
+  . Fixed bug #81202 (powerpc64 build fails on fibers). (krakjoe)
+  . Fixed bug #80072 (Cyclic unserialize in TMPVAR operand may leak). (Nikita)
+
+- Curl:
+  . Fixed bug #81085 (Support CURLOPT_SSLCERT_BLOB for cert strings).
+    (camporter)
 
+- Reflection:
+  . Fixed bug #81200 (no way to determine if Closure is static). (krakjoe)
 
 24 Jun 2021, PHP 8.1.0alpha2
 

TSRM/TSRM.c

@@ -229,11 +229,11 @@ TSRM_API void tsrm_shutdown(void)
 /* {{{ */
 /* environ lock api */
 TSRM_API void tsrm_env_lock(void) {
-    tsrm_mutex_lock(tsrm_env_mutex);
+	tsrm_mutex_lock(tsrm_env_mutex);
 }
 
 TSRM_API void tsrm_env_unlock(void) {
-    tsrm_mutex_unlock(tsrm_env_mutex);
+	tsrm_mutex_unlock(tsrm_env_mutex);
 } /* }}} */
 
 /* enlarge the arrays for the already active threads */
@@ -768,7 +768,7 @@ TSRM_API uint8_t tsrm_is_main_thread(void)
 
 TSRM_API uint8_t tsrm_is_shutdown(void)
 {/*{{{*/
-    return is_thread_shutdown;
+	return is_thread_shutdown;
 }/*}}}*/
 
 TSRM_API const char *tsrm_api_name(void)

UPGRADING

@@ -193,6 +193,16 @@ PHP 8.1 UPGRADE NOTES
 
 - Curl:
   . Added CURLOPT_DOH_URL option.
+  . Added certificate blob options when for libcurl >= 7.71.0:
+
+        CURLOPT_ISSUERCERT_BLOB
+        CURLOPT_PROXY_ISSUERCERT
+        CURLOPT_PROXY_ISSUERCERT_BLOB
+        CURLOPT_PROXY_SSLCERT_BLOB
+        CURLOPT_PROXY_SSLKEY_BLOB
+        CURLOPT_SSLCERT_BLOB
+        CURLOPT_SSLKEY_BLOB
+
   . Added CURLStringFile, which can be used to post a file from a string rather
     than a file:
 

Zend/Optimizer/escape_analysis.c

@@ -188,7 +188,7 @@ static int is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, in
 				}
 				break;
 		}
-    } else if (ssa_op->op1_def == var) {
+	} else if (ssa_op->op1_def == var) {
 		switch (opline->opcode) {
 			case ZEND_ASSIGN:
 				if (opline->op2_type == IS_CONST
@@ -208,7 +208,7 @@ static int is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, in
 		}
 	}
 
-    return 0;
+	return 0;
 }
 /* }}} */
 

Zend/Optimizer/optimize_temp_vars_5.c

@@ -59,12 +59,12 @@ void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_c
 	valid_T = (zend_bitset) zend_arena_alloc(&ctx->arena, bitset_len * ZEND_BITSET_ELM_SIZE);
 	map_T = (int *) zend_arena_alloc(&ctx->arena, T * sizeof(int));
 
-    end = op_array->opcodes;
-    opline = &op_array->opcodes[op_array->last - 1];
+	end = op_array->opcodes;
+	opline = &op_array->opcodes[op_array->last - 1];
 
-    /* Find T definition points */
-    while (opline >= end) {
-        if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
+	/* Find T definition points */
+	while (opline >= end) {
+		if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
 			start_of_T[VAR_NUM(opline->result.var) - offset] = opline;
 		}
 		opline--;
@@ -73,10 +73,10 @@ void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_c
 	zend_bitset_clear(valid_T, bitset_len);
 	zend_bitset_clear(taken_T, bitset_len);
 
-    end = op_array->opcodes;
-    opline = &op_array->opcodes[op_array->last - 1];
+	end = op_array->opcodes;
+	opline = &op_array->opcodes[op_array->last - 1];
 
-    while (opline >= end) {
+	while (opline >= end) {
 		if ((opline->op1_type & (IS_VAR | IS_TMP_VAR))) {
 			currT = VAR_NUM(opline->op1.var) - offset;
 			if (opline->opcode == ZEND_ROPE_END) {

Zend/Optimizer/zend_call_graph.c

@@ -35,7 +35,7 @@ static void zend_op_array_calc(zend_op_array *op_array, void *context)
 static void zend_op_array_collect(zend_op_array *op_array, void *context)
 {
 	zend_call_graph *call_graph = context;
-    zend_func_info *func_info = call_graph->func_infos + call_graph->op_arrays_count;
+	zend_func_info *func_info = call_graph->func_infos + call_graph->op_arrays_count;
 
 	ZEND_SET_FUNC_INFO(op_array, func_info);
 	call_graph->op_arrays[call_graph->op_arrays_count] = op_array;

Zend/Optimizer/zend_inference.c

@@ -3285,7 +3285,7 @@ static zend_always_inline int _zend_update_type_info(
 				if (opline->opcode == ZEND_FETCH_DIM_W ||
 				    opline->opcode == ZEND_FETCH_DIM_RW ||
 				    opline->opcode == ZEND_FETCH_DIM_FUNC_ARG ||
-                    opline->opcode == ZEND_FETCH_LIST_W) {
+				    opline->opcode == ZEND_FETCH_LIST_W) {
 					if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
 						if (opline->opcode != ZEND_FETCH_DIM_FUNC_ARG) {
 							tmp &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE);

Zend/Optimizer/zend_optimizer.c

@@ -645,7 +645,7 @@ int zend_optimizer_replace_by_const(zend_op_array *op_array,
 					ZEND_ASSERT(opline->op1.var == var);
 
 					break;
-				  }
+				}
 				default:
 					break;
 			}

Zend/tests/assign_by_val_function_by_ref_return_value.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Return value of assigning by-val function result by-reference
+--FILE--
+<?php
+$a = [&$a];
+var_dump($a[0] =& returnsVal());
+function returnsVal() {}
+?>
+--EXPECTF--
+Notice: Only variables should be assigned by reference in %s on line %d
+NULL

Zend/tests/bitwise_not_precision_exception.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Promoting float precision warning to exception in bitwise_not
+--FILE--
+<?php
+set_error_handler(function($_, $msg) {
+    throw new Exception($msg);
+});
+try {
+    var_dump(~INF);
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+Implicit conversion from float INF to int loses precision