Update versions for PHP 7.2.22

Prep for 7.2.22 GA
Fix #75457 : heap-use-after-free in php7.0.25
2026-11-08 17:50:50 +00:00 · 2019-08-28 02:37:29 +00:00 · 2019-08-27 22:34:24 -04:00 · 2019-08-27 22:26:21 -04:00 · 2019-08-27 22:25:35 -04:00 · 2019-08-13 22:57:08 +00:00
179 changed files with 329 additions and 3786 deletions
@@ -16,7 +16,7 @@ environment:
        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
        PHP_BUILD_OBJ_DIR: c:\obj
        PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0beta6
        PHP_BUILD_CRT: vc15
        # ext and env setup for tests
        #MYSQL_TEST_PASSWD: Password12!
@@ -1,202 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-14 May 2020, PHP 7.2.31
-
- Core:
-  . Fixed bug #78875 (Long filenames cause OOM and temp files are not cleaned). 
-    (CVE-2019-11048) (cmb)
-  . Fixed bug #78876 (Long variables in multipart/form-data cause OOM and temp 
-    files are not cleaned). (CVE-2019-11048) (cmb)
-
-16 Apr 2020, PHP 7.2.30
-
- Standard:
-  . Fixed bug #79468 (SIGSEGV when closing stream handle with a stream filter
-    appended). (dinosaur)
-  . Fixed bug #79330 (shell_exec() silently truncates after a null byte). (stas)
-  . Fixed bug #79465 (OOB Read in urldecode()). (stas)
-
-19 Mar 2020, PHP 7.2.29
-
- EXIF:
-  . Fixed bug #79282 (Use-of-uninitialized-value in exif). (CVE-2020-7064) 
-    (Nikita)
-
- Standard: 
-  . Fixed bug #79329 (get_headers() silently truncates after a null byte) 
-    (CVE-2020-7066). (cmb)
-
-20 Feb 2020, PHP 7.2.28
-
- DOM:
-  . Fixed bug #77569: (Write Access Violation in DomImplementation). (Nikita,
-    cmb)
-
- Phar:
-  . Fixed bug #79082 (Files added to tar with Phar::buildFromIterator have
-    all-access permissions). (CVE-2020-7063) (stas)
-
- Session:
-  . Fixed bug #79221 (Null Pointer Dereference in PHP Session Upload Progress).
-    (CVE-2020-7062) (stas)
-
-23 Jan 2020, PHP 7.2.27
-
- Mbstring:
-  . Fixed bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`). 
-    (CVE-2020-7060) (Nikita)
-
- Session:
-  . Fixed bug #79091 (heap use-after-free in session_create_id()). (cmb, Nikita)
-
- Standard:
-  . Fixed bug #79099 (OOB read in php_strip_tags_ex). (CVE-2020-7059). (cmb)
-
-18 Dec 2019, PHP 7.2.26
-
- Bcmath:
-  . Fixed bug #78878 (Buffer underflow in bc_shift_addsub). (CVE-2019-11046).
-    (cmb)
-
- Core:
-  . Fixed bug #78862 (link() silently truncates after a null byte on Windows).
-    (CVE-2019-11044). (cmb)
-  . Fixed bug #78863 (DirectoryIterator class silently truncates after a null
-    byte). (CVE-2019-11045). (cmb)
-
- EXIF:
-  . Fixed bug #78793 (Use-after-free in exif parsing under memory sanitizer).
-    (CVE-2019-11050). (Nikita)
-  . Fixed bug #78910 (Heap-buffer-overflow READ in exif). (CVE-2019-11047).
-    (Nikita)
-
- GD:
-  . Fixed bug #78849 (GD build broken with -D SIGNED_COMPARE_SLOW). (cmb)
-
- Intl:
-  . Fixed bug #78804 (Segmentation fault in Locale::filterMatches). (Stas)
-
- OPcache:
-  . Fixed $x = (bool)$x; with opcache (should emit undeclared variable notice).
-    (Tyson Andre)
-
- Standard:
-  . Fixed bug #78759 (array_search in $GLOBALS). (Nikita)
-  . Fixed bug #78833 (Integer overflow in pack causes out-of-bound access).
-    (cmb)
-  . Fixed bug #78814 (strip_tags allows / in tag name => whitelist bypass).
-    (cmb)
-
-21 Nov 2019, PHP 7.2.25
-
- Core:
-  . Fixed bug #78656 (Parse errors classified as highest log-level). (Erik
-    Lundin)
-  . Fixed bug #78752 (Segfault if GC triggered while generator stack frame is
-    being destroyed). (Nikita)
-  . Fixed bug #78689 (Closure::fromCallable() doesn't handle
-    [Closure, '__invoke']). (Nikita)
-
- COM:
-  . Fixed bug #78694 (Appending to a variant array causes segfault). (cmb)
-
- Date:
-  . Fixed bug #70153 (\DateInterval incorrectly unserialized). (Maksim Iakunin)
-  . Fixed bug #78751 (Serialising DatePeriod converts DateTimeImmutable). (cmb)
-
- Iconv:
-  . Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas,
-    cmb).
-
- OpCache:
-  . Fixed bug #78654 (Incorrectly computed opcache checksum on files with
-    non-ascii characters). (mhagstrand)
-  . Fixed bug #78747 (OpCache corrupts custom extension result). (Nikita)
-
- OpenSSL:
-  . Fixed bug #78775 (TLS issues from HTTP request affecting other encrypted
-    connections). (Nikita)
-
- Reflection:
-  . Fixed bug #78697 (ReflectionClass::ImplementsInterface - inaccurate error
-    message with traits). (villfa)
-
- Sockets:
-  . Fixed bug #78665 (Multicasting may leak memory). (cmb)
-
-24 Oct 2019, PHP 7.2.24
-
- Core:
-  . Fixed bug #78535 (auto_detect_line_endings value not parsed as bool).
-    (bugreportuser)
-  . Fixed bug #78620 (Out of memory error). (cmb, Nikita)
-
- Exif:
-  . Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
-	(Kalle)
-
- FPM:
-  . Fixed bug #78599 (env_path_info underflow in fpm_main.c can lead to RCE).
-    (CVE-2019-11043) (Jakub Zelenka)
-
- MBString:
-  . Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).
-    (cmb)
-  . Fixed bug #78609 (mb_check_encoding() no longer supports stringable
-    objects). (cmb)
-
- MySQLi:
-  . Fixed bug #76809 (SSL settings aren't respected when persistent connections 
-    are used). (fabiomsouto)
-
- PDO_MySQL:
-  . Fixed bug #78623 (Regression caused by "SP call yields additional empty
-    result set"). (cmb)
-
- Session:
-  . Fixed bug #78624 (session_gc return value for user defined session 
-    handlers). (bshaffer)
-
- Standard:
-  . Fixed bug #76342 (file_get_contents waits twice specified timeout).
-    (Thomas Calvet)
-  . Fixed bug #78612 (strtr leaks memory when integer keys are used and the
-    subject string shorter). (Nikita)
-  . Fixed bug #76859 (stream_get_line skips data if used with data-generating 
-    filter). (kkopachev)
-
- Zip:
-  . Fixed bug #78641 (addGlob can modify given remove_path value). (cmb)
-
-26 Sep 2019, PHP 7.2.23
-
- Core:
-  . Fixed bug #78220 (Can't access OneDrive folder). (cmb, ab)
-  . Fixed bug #78412 (Generator incorrectly reports non-releasable $this as GC
-    child). (Nikita)
-
- FastCGI:
-  . Fixed bug #78469 (FastCGI on_accept hook is not called when using named
-    pipes on Windows). (Sergei Turchanov)
-
- MySQLnd:
-  . Fixed connect_attr issues and added the _server_host connection attribute.
-    (Qianqian Bu)
-
- ODBC:
-  . Fixed bug #78473 (odbc_close() closes arbitrary resources). (cmb)
-
- PDO_MySQL:
-  . Fixed bug #41997 (SP call yields additional empty result set). (cmb)
-
- sodium:
-  . Fixed bug #78510 (Partially uninitialized buffer returned by
-    sodium_crypto_generichash_init()). (Frank Denis, cmb)
-
- SPL:
-  . Fixed bug #72884 (SplObject isCloneable() returns true but errs on clone).
-    (Chu Zhaowei)
-
 29 Aug 2019, PHP 7.2.22

 - Core:
@@ -333,10 +136,6 @@ PHP                                                                        NEWS

 30 May 2019, PHP 7.2.19

- Date:
-  . Fixed bug #77909 (DatePeriod::__construct() with invalid recurrence count
-    value). (Ignace Nyamagana Butera)
-
 - EXIF:
  . Fixed bug #77988 (heap-buffer-overflow on php_jpg_get16).
    (CVE-2019-11040) (Stas)
@@ -383,6 +182,10 @@ PHP                                                                        NEWS
  . Fixed bug #77794 (Incorrect Date header format in built-in server).
    (kelunik)

+- Date:
+  . Fixed bug #77909 (DatePeriod::__construct() with invalid recurrence count
+    value). (Ignace Nyamagana Butera)
+
 - EXIF
  . Fixed bug #77950 (Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG).
    (CVE-2019-11036) (Stas)
@@ -140,7 +140,6 @@ assert(0 && ($a = function () {
    if ($a) {
    } elseif ($b) {
    }
-    if ($a); else;
 }));

 ?>
@@ -293,7 +292,4 @@ Warning: assert(): assert(0 && ($a = function () {
    if ($a) {
    } elseif ($b) {
    }
-    if ($a) {
-    } else {
-    }
 })) failed in %sexpect_015.php on line %d
@@ -1,13 +0,0 @@
--TEST--
-Bug #78689: Closure::fromCallable() doesn't handle [Closure, '__invoke']
--FILE--
-<?php
-$a = [function () { echo "123\n"; }, '__invoke'];
-$a();
-
-$b = Closure::fromCallable($a);
-$b();
-?>
--EXPECT--
-123
-123
@@ -1,24 +0,0 @@
--TEST--
-Bug #78752: Segfault if GC triggered while generator stack frame is being destroyed
--FILE--
-<?php
-
-function gen(&$gen) {
-    $a = new stdClass;
-    $a->a = $a;
-    $b = new stdClass;
-    $b->b = $b;
-    yield 1;
-}
-
-$gen = gen($gen);
-var_dump($gen->current());
-for ($i = 0; $i < 9999; $i++) {
-    $a = new stdClass;
-    $a->a = $a;
-}
-$gen->next();
-
-?>
--EXPECT--
-int(1)
@@ -1,11 +0,0 @@
--TEST--
-Immediately invoked closure with extra args
--FILE--
-<?php
-
-(function() {})(new stdClass);
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,26 +0,0 @@
--TEST--
-Object properties HT may need to be removed from nested data
--FILE--
-<?php
-
-class Test {
-    public function __destruct() {
-        $GLOBALS['x'] = $this;
-    }
-}
-
-$t = new Test;
-$t->x = new stdClass;
-$t->x->t = $t;
-$a = (array) $t->x;
-unset($t, $a);
-gc_collect_cycles();
-var_dump($x);
-
-// TODO: The destructor *should* be running here, but doesn't.
-// This works in PHP >= 7.3 though.
-
-?>
--EXPECTF--
-Notice: Undefined variable: x in %s on line %d
-NULL
@@ -1,8 +0,0 @@
--TEST--
-Using __COMPILER_HALF_OFFSET__ with trailing {} (OSS-Fuzz #17895)
--FILE--
-<?php
-__COMPILER_HALT_OFFSET__;
-{}
--EXPECTF--
-Warning: Use of undefined constant __COMPILER_HALT_OFFSET__ - assumed '__COMPILER_HALT_OFFSET__' (this will throw an Error in a future version of PHP) in %s on line %d
@@ -1,17 +0,0 @@
--TEST--
-Memory leak on ** with result==op1 array
--FILE--
-<?php
-
-$x = [0];
-$x **= 1;
-var_dump($x);
-
-$x = [0];
-$x **= $x;
-var_dump($x);
-
-?>
--EXPECT--
-int(0)
-int(0)
@@ -1,15 +0,0 @@
--TEST--
-Calling a static method on a non-existing class
--FILE--
-<?php
-
-$str = "foo";
-try {
-    Test::{$str . "bar"}();
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
-
-?>
--EXPECT--
-Class 'Test' not found
@@ -980,7 +980,7 @@ get_chunk:
 				heap->cached_chunks = chunk->next;
 			} else {
 #if ZEND_MM_LIMIT
-				if (UNEXPECTED(ZEND_MM_CHUNK_SIZE > heap->limit - heap->real_size)) {
+				if (UNEXPECTED(heap->real_size + ZEND_MM_CHUNK_SIZE > heap->limit)) {
 					if (zend_mm_gc(heap)) {
 						goto get_chunk;
 					} else if (heap->overflow == 0) {
@@ -1484,8 +1484,8 @@ static void *zend_mm_realloc_heap(zend_mm_heap *heap, void *ptr, size_t size, si
 				}
 			} else /* if (new_size > old_size) */ {
 #if ZEND_MM_LIMIT
-				if (UNEXPECTED(new_size - old_size > heap->limit - heap->real_size)) {
-					if (zend_mm_gc(heap) && new_size - old_size <= heap->limit - heap->real_size) {
+				if (UNEXPECTED(heap->real_size + (new_size - old_size) > heap->limit)) {
+					if (zend_mm_gc(heap) && heap->real_size + (new_size - old_size) <= heap->limit) {
 						/* pass */
 					} else if (heap->overflow == 0) {
 #if ZEND_DEBUG
@@ -1723,20 +1723,15 @@ static void *zend_mm_alloc_huge(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_D
 	 * We allocate them with 2MB size granularity, to avoid many
 	 * reallocations when they are extended by small pieces
 	 */
-	size_t alignment = MAX(REAL_PAGE_SIZE, ZEND_MM_CHUNK_SIZE);
+	size_t new_size = ZEND_MM_ALIGNED_SIZE_EX(size, MAX(REAL_PAGE_SIZE, ZEND_MM_CHUNK_SIZE));
 #else
-	size_t alignment = REAL_PAGE_SIZE;
+	size_t new_size = ZEND_MM_ALIGNED_SIZE_EX(size, REAL_PAGE_SIZE);
 #endif
-	size_t new_size = ZEND_MM_ALIGNED_SIZE_EX(size, alignment);
 	void *ptr;

-	if (UNEXPECTED(new_size < size)) {
-		zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu + %zu)", size, alignment);
-	}
-
 #if ZEND_MM_LIMIT
-	if (UNEXPECTED(new_size > heap->limit - heap->real_size)) {
-		if (zend_mm_gc(heap) && new_size <= heap->limit - heap->real_size) {
+	if (UNEXPECTED(heap->real_size + new_size > heap->limit)) {
+		if (zend_mm_gc(heap) && heap->real_size + new_size <= heap->limit) {
 			/* pass */
 		} else if (heap->overflow == 0) {
 #if ZEND_DEBUG
@@ -894,7 +894,7 @@ tail_call:
 		} else {
 			zend_ast_export_indent(str, indent);
 			smart_str_appends(str, "} else ");
-			if (ast->child[1] && ast->child[1]->kind == ZEND_AST_IF) {
+			if (ast->child[1]->kind == ZEND_AST_IF) {
 				list = (zend_ast_list*)ast->child[1];
 				goto tail_call;
 			} else {
@@ -268,16 +268,8 @@ static int zend_create_closure_from_callable(zval *return_value, zval *callable,

 	mptr = fcc.function_handler;
 	if (mptr->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
-		/* For Closure::fromCallable([$closure, "__invoke"]) return $closure. */
-		if (fcc.object && fcc.object->ce == zend_ce_closure
-				&& zend_string_equals_literal(mptr->common.function_name, "__invoke")) {
-			ZVAL_OBJ(return_value, fcc.object);
-			GC_REFCOUNT(fcc.object)++;
-			zend_free_trampoline(mptr);
-			return SUCCESS;
-		}
-
 		memset(&call, 0, sizeof(zend_internal_function));
+
 		call.type = ZEND_INTERNAL_FUNCTION;
 		call.handler = zend_closure_call_magic;
 		call.function_name = mptr->common.function_name;
@@ -7676,9 +7676,6 @@ void zend_compile_const(znode *result, zend_ast *ast) /* {{{ */

 		while (last && last->kind == ZEND_AST_STMT_LIST) {
 			zend_ast_list *list = zend_ast_get_list(last);
-			if (list->children == 0) {
-				break;
-			}
 			last = list->child[list->children-1];
 		}
 		if (last && last->kind == ZEND_AST_HALT_COMPILER) {
@@ -1007,10 +1007,6 @@ tail_call:
 					ref = Z_COUNTED_P(zv);
 					goto tail_call;
 				}
-				if (GC_ADDRESS(GC_INFO(ht)) != 0 && GC_REF_GET_COLOR(ht) == GC_BLACK) {
-					GC_TRACE_REF(ht, "removing from buffer");
-					GC_REMOVE_FROM_BUFFER(ht);
-				}
 			} else {
 				return;
 			}
@@ -97,18 +97,16 @@ ZEND_API zend_execute_data* zend_generator_freeze_call_stack(zend_execute_data *
 /* }}} */

 static void zend_generator_cleanup_unfinished_execution(
-		zend_generator *generator, zend_execute_data *execute_data, uint32_t catch_op_num) /* {{{ */
+		zend_generator *generator, uint32_t catch_op_num) /* {{{ */
 {
+	zend_execute_data *execute_data = generator->execute_data;
+
 	if (execute_data->opline != execute_data->func->op_array.opcodes) {
 		/* -1 required because we want the last run opcode, not the next to-be-run one. */
 		uint32_t op_num = execute_data->opline - execute_data->func->op_array.opcodes - 1;

 		if (UNEXPECTED(generator->frozen_call_stack)) {
-			/* Temporarily restore generator->execute_data if it has been NULLed out already. */
-			zend_execute_data *save_ex = generator->execute_data;
-			generator->execute_data = execute_data;
 			zend_generator_restore_call_stack(generator);
-			generator->execute_data = save_ex;
 		}
 		zend_cleanup_unfinished_execution(execute_data, op_num, catch_op_num);
 	}
@@ -119,9 +117,6 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 {
 	if (EXPECTED(generator->execute_data)) {
 		zend_execute_data *execute_data = generator->execute_data;
-		/* Null out execute_data early, to prevent double frees if GC runs while we're
-		 * already cleaning up execute_data. */
-		generator->execute_data = NULL;

 		if (EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE) {
 			zend_clean_and_cache_symbol_table(execute_data->symbol_table);
@@ -140,12 +135,12 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 			return;
 		}

-		zend_vm_stack_free_extra_args(execute_data);
+		zend_vm_stack_free_extra_args(generator->execute_data);

 		/* Some cleanups are only necessary if the generator was closed
 		 * before it could finish execution (reach a return statement). */
 		if (UNEXPECTED(!finished_execution)) {
-			zend_generator_cleanup_unfinished_execution(generator, execute_data, 0);
+			zend_generator_cleanup_unfinished_execution(generator, 0);
 		}

 		/* Free closure object */
@@ -159,7 +154,8 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 			generator->gc_buffer = NULL;
 		}

-		efree(execute_data);
+		efree(generator->execute_data);
+		generator->execute_data = NULL;
 	}
 }
 /* }}} */
@@ -220,7 +216,7 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 	if (finally_op_num) {
 		zval *fast_call;

-		zend_generator_cleanup_unfinished_execution(generator, ex, finally_op_num);
+		zend_generator_cleanup_unfinished_execution(generator, finally_op_num);

 		fast_call = ZEND_CALL_VAR(ex, ex->func->op_array.opcodes[finally_op_end].op1.var);
 		Z_OBJ_P(fast_call) = EG(exception);
@@ -275,7 +271,7 @@ static uint32_t calc_gc_buffer_size(zend_generator *generator) /* {{{ */
 		if (EX_CALL_INFO() & ZEND_CALL_FREE_EXTRA_ARGS) {
 			size += EX_NUM_ARGS() - op_array->num_args;
 		}
-		size += (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) != 0; /* $this */
+		size += Z_TYPE(execute_data->This) == IS_OBJECT; /* $this */
 		size += (EX_CALL_INFO() & ZEND_CALL_CLOSURE) != 0; /* Closure object */

 		/* Live vars */
@@ -356,7 +352,7 @@ static HashTable *zend_generator_get_gc(zval *object, zval **table, int *n) /* {
 		}
 	}

-	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
+	if (Z_TYPE(execute_data->This) == IS_OBJECT) {
 		ZVAL_OBJ(gc_buffer++, Z_OBJ(execute_data->This));
 	}
 	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {
@@ -1128,18 +1128,12 @@ ZEND_API int ZEND_FASTCALL pow_function(zval *result, zval *op1, zval *op2) /* {

 					if (EXPECTED(op1 != op2)) {
 						if (Z_TYPE_P(op1) == IS_ARRAY) {
-							if (op1 == result) {
-								zval_ptr_dtor(result);
-							}
 							ZVAL_LONG(result, 0);
 							return SUCCESS;
 						} else {
 							zendi_convert_scalar_to_number(op1, op1_copy, result, 0);
 						}
 						if (Z_TYPE_P(op2) == IS_ARRAY) {
-							if (op1 == result) {
-								zval_ptr_dtor(result);
-							}
 							ZVAL_LONG(result, 1L);
 							return SUCCESS;
 						} else {
@@ -1147,9 +1141,6 @@ ZEND_API int ZEND_FASTCALL pow_function(zval *result, zval *op1, zval *op2) /* {
 						}
 					} else {
 						if (Z_TYPE_P(op1) == IS_ARRAY) {
-							if (op1 == result) {
-								zval_ptr_dtor(result);
-							}
 							ZVAL_LONG(result, 0);
 							return SUCCESS;
 						} else {
@@ -91,10 +91,10 @@ ZEND_API const char* ZEND_FASTCALL zend_memnstr_ex(const char *haystack, const c
 ZEND_API const char* ZEND_FASTCALL zend_memnrstr_ex(const char *haystack, const char *needle, size_t needle_len, const char *end);

 #if SIZEOF_ZEND_LONG == 4
-#	define ZEND_DOUBLE_FITS_LONG(d) (!((d) > (double)ZEND_LONG_MAX || (d) < (double)ZEND_LONG_MIN))
+#	define ZEND_DOUBLE_FITS_LONG(d) (!((d) > ZEND_LONG_MAX || (d) < ZEND_LONG_MIN))
 #else
 	/* >= as (double)ZEND_LONG_MAX is outside signed range */
-#	define ZEND_DOUBLE_FITS_LONG(d) (!((d) >= (double)ZEND_LONG_MAX || (d) < (double)ZEND_LONG_MIN))
+#	define ZEND_DOUBLE_FITS_LONG(d) (!((d) >= ZEND_LONG_MAX || (d) < ZEND_LONG_MIN))
 #endif

 #if ZEND_DVAL_TO_LVAL_CAST_OK
@@ -91,8 +91,6 @@ cwd_state main_cwd_state; /* True global */
 #include <unistd.h>
 #else
 #include <direct.h>
-#include "zend_globals.h"
-#include "zend_globals_macros.h"
 #endif

 #define CWD_STATE_COPY(d, s)				\
@@ -857,7 +855,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 		tmp = do_alloca(len+1, use_heap);
 		memcpy(tmp, path, len+1);

-retry:
 		if(save &&
 				!(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
                               (dataw.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
@@ -898,21 +895,7 @@ retry:
 				return -1;
 			}
 			if(!DeviceIoControl(hLink, FSCTL_GET_REPARSE_POINT, NULL, 0, pbuffer,  MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &retlength, NULL)) {
-				BY_HANDLE_FILE_INFORMATION fileInformation;
-
 				free_alloca(pbuffer, use_heap_large);
-				if ((dataw.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
-						(dataw.dwReserved0 & ~IO_REPARSE_TAG_CLOUD_MASK) == IO_REPARSE_TAG_CLOUD &&
-						EG(windows_version_info).dwMajorVersion >= 10 &&
-						EG(windows_version_info).dwMinorVersion == 0 &&
-						EG(windows_version_info).dwBuildNumber >= 18362 &&
-						GetFileInformationByHandle(hLink, &fileInformation) &&
-						!(fileInformation.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
-					dataw.dwFileAttributes = fileInformation.dwFileAttributes;
-					CloseHandle(hLink);
-					(*ll)--;
-					goto retry;
-				}
 				free_alloca(tmp, use_heap);
 				CloseHandle(hLink);
 				FREE_PATHW()
@@ -992,7 +975,8 @@ retry:
 			}
 			else if (pbuffer->ReparseTag == IO_REPARSE_TAG_DEDUP ||
 					/* Starting with 1709. */
-					(pbuffer->ReparseTag & ~IO_REPARSE_TAG_CLOUD_MASK) == IO_REPARSE_TAG_CLOUD ||
+					(pbuffer->ReparseTag & IO_REPARSE_TAG_CLOUD_MASK) != 0 && 0x90001018L != pbuffer->ReparseTag ||
+					IO_REPARSE_TAG_CLOUD == pbuffer->ReparseTag ||
 					IO_REPARSE_TAG_ONEDRIVE == pbuffer->ReparseTag) {
 				isabsolute = 1;
 				substitutename = malloc((len + 1) * sizeof(char));
@@ -758,10 +758,8 @@ ZEND_VM_HANDLER(13, ZEND_BOOL_NOT, CONST|TMPVAR|CV, ANY)
 	if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 	} else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
-		/* The result and op1 can be the same cv zval */
-		const uint32_t orig_val_type = Z_TYPE_INFO_P(val);
 		ZVAL_TRUE(EX_VAR(opline->result.var));
-		if (OP1_TYPE == IS_CV && UNEXPECTED(orig_val_type == IS_UNDEF)) {
+		if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 			SAVE_OPLINE();
 			GET_OP1_UNDEF_CV(val, BP_VAR_R);
 			ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -2400,11 +2398,6 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
 			zend_clean_and_cache_symbol_table(EX(symbol_table));
 		}
 		EG(current_execute_data) = EX(prev_execute_data);
-
-		/* Free extra args before releasing the closure,
-		 * as that may free the op_array. */
-		zend_vm_stack_free_extra_args_ex(call_info, execute_data);
-
 		if (UNEXPECTED(call_info & ZEND_CALL_RELEASE_THIS)) {
 			zend_object *object = Z_OBJ(execute_data->This);
 #if 0
@@ -2420,6 +2413,7 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
 			OBJ_RELEASE((zend_object*)execute_data->func->op_array.prototype);
 		}

+		zend_vm_stack_free_extra_args_ex(call_info, execute_data);
 		old_execute_data = execute_data;
 		execute_data = EX(prev_execute_data);
 		zend_vm_stack_free_call_frame_ex(call_info, old_execute_data);
@@ -3100,7 +3094,6 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CLASS_FETCH|CONST|VAR,
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-				FREE_UNFETCHED_OP2();
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -4757,10 +4750,8 @@ ZEND_VM_HANDLER(52, ZEND_BOOL, CONST|TMPVAR|CV, ANY)
 	if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 		ZVAL_TRUE(EX_VAR(opline->result.var));
 	} else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
-		/* The result and op1 can be the same cv zval */
-		const uint32_t orig_val_type = Z_TYPE_INFO_P(val);
 		ZVAL_FALSE(EX_VAR(opline->result.var));
-		if (OP1_TYPE == IS_CV && UNEXPECTED(orig_val_type == IS_UNDEF)) {
+		if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 			SAVE_OPLINE();
 			GET_OP1_UNDEF_CV(val, BP_VAR_R);
 			ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -468,11 +468,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_
 			zend_clean_and_cache_symbol_table(EX(symbol_table));
 		}
 		EG(current_execute_data) = EX(prev_execute_data);
-
-		/* Free extra args before releasing the closure,
-		 * as that may free the op_array. */
-		zend_vm_stack_free_extra_args_ex(call_info, execute_data);
-
 		if (UNEXPECTED(call_info & ZEND_CALL_RELEASE_THIS)) {
 			zend_object *object = Z_OBJ(execute_data->This);
 #if 0
@@ -488,6 +483,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_
 			OBJ_RELEASE((zend_object*)execute_data->func->op_array.prototype);
 		}

+		zend_vm_stack_free_extra_args_ex(call_info, execute_data);
 		old_execute_data = execute_data;
 		execute_data = EX(prev_execute_data);
 		zend_vm_stack_free_call_frame_ex(call_info, old_execute_data);
@@ -2653,10 +2649,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_NOT_SPEC_CONST_HANDLER(ZE
 	if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 	} else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
-		/* The result and op1 can be the same cv zval */
-		const uint32_t orig_val_type = Z_TYPE_INFO_P(val);
 		ZVAL_TRUE(EX_VAR(opline->result.var));
-		if (IS_CONST == IS_CV && UNEXPECTED(orig_val_type == IS_UNDEF)) {
+		if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 			SAVE_OPLINE();
 			GET_OP1_UNDEF_CV(val, BP_VAR_R);
 			ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -3187,10 +3181,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_SPEC_CONST_HANDLER(ZEND_O
 	if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 		ZVAL_TRUE(EX_VAR(opline->result.var));
 	} else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
-		/* The result and op1 can be the same cv zval */
-		const uint32_t orig_val_type = Z_TYPE_INFO_P(val);
 		ZVAL_FALSE(EX_VAR(opline->result.var));
-		if (IS_CONST == IS_CV && UNEXPECTED(orig_val_type == IS_UNDEF)) {
+		if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 			SAVE_OPLINE();
 			GET_OP1_UNDEF_CV(val, BP_VAR_R);
 			ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -5421,7 +5413,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -7383,7 +7374,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -9472,7 +9462,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -11495,7 +11484,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-				zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -19468,7 +19456,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -21268,7 +21255,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -23869,7 +23855,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -26370,7 +26355,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-				zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -28290,7 +28274,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -29068,7 +29051,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -30901,7 +30883,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -32617,7 +32598,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
 			ce = zend_fetch_class_by_name(Z_STR_P(EX_CONSTANT(opline->op1)), EX_CONSTANT(opline->op1) + 1, ZEND_FETCH_CLASS_DEFAULT |  ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(ce == NULL)) {
 				ZEND_ASSERT(EG(exception));
-				zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 				HANDLE_EXCEPTION();
 			}
 			CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce);
@@ -32870,10 +32850,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_NOT_SPEC_CV_HANDLER(ZEND_
 	if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 	} else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
-		/* The result and op1 can be the same cv zval */
-		const uint32_t orig_val_type = Z_TYPE_INFO_P(val);
 		ZVAL_TRUE(EX_VAR(opline->result.var));
-		if (IS_CV == IS_CV && UNEXPECTED(orig_val_type == IS_UNDEF)) {
+		if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 			SAVE_OPLINE();
 			GET_OP1_UNDEF_CV(val, BP_VAR_R);
 			ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -33710,10 +33688,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCO
 	if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 		ZVAL_TRUE(EX_VAR(opline->result.var));
 	} else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
-		/* The result and op1 can be the same cv zval */
-		const uint32_t orig_val_type = Z_TYPE_INFO_P(val);
 		ZVAL_FALSE(EX_VAR(opline->result.var));
-		if (IS_CV == IS_CV && UNEXPECTED(orig_val_type == IS_UNDEF)) {
+		if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 			SAVE_OPLINE();
 			GET_OP1_UNDEF_CV(val, BP_VAR_R);
 			ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -48545,10 +48521,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_NOT_SPEC_TMPVAR_HANDLER(Z
 	if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 		ZVAL_FALSE(EX_VAR(opline->result.var));
 	} else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
-		/* The result and op1 can be the same cv zval */
-		const uint32_t orig_val_type = Z_TYPE_INFO_P(val);
 		ZVAL_TRUE(EX_VAR(opline->result.var));
-		if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(orig_val_type == IS_UNDEF)) {
+		if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 			SAVE_OPLINE();
 			GET_OP1_UNDEF_CV(val, BP_VAR_R);
 			ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -48811,10 +48785,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_SPEC_TMPVAR_HANDLER(ZEND_
 	if (Z_TYPE_INFO_P(val) == IS_TRUE) {
 		ZVAL_TRUE(EX_VAR(opline->result.var));
 	} else if (EXPECTED(Z_TYPE_INFO_P(val) <= IS_TRUE)) {
-		/* The result and op1 can be the same cv zval */
-		const uint32_t orig_val_type = Z_TYPE_INFO_P(val);
 		ZVAL_FALSE(EX_VAR(opline->result.var));
-		if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(orig_val_type == IS_UNDEF)) {
+		if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(val) == IS_UNDEF)) {
 			SAVE_OPLINE();
 			GET_OP1_UNDEF_CV(val, BP_VAR_R);
 			ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -398,8 +398,6 @@ AC_DEFUN([PHP_EVAL_LIBLINE],[
        $2="[$]$2 -pthread"
      else
        PHP_RUN_ONCE(EXTRA_LDFLAGS, [$ac_i], [EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"])
-        PHP_RUN_ONCE(EXTRA_LDFLAGS_PROGRAM, [$ac_i],
-            [EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $ac_i"])
      fi
    ;;
    -l*[)]
@@ -2209,7 +2207,7 @@ AC_DEFUN([PHP_SETUP_ICU],[

  dnl If pkg-config is found try using it
  if test "$PHP_ICU_DIR" = "DEFAULT" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists icu-uc icu-io icu-i18n; then
-    if $PKG_CONFIG --atleast-version=4.0 icu-uc; then
+    if $PKG_CONFIG --atleast-version=40 icu-uc; then
      found_icu=yes
      icu_version_full=`$PKG_CONFIG --modversion icu-uc`
      ac_IFS=$IFS
@@ -2221,8 +2219,7 @@ AC_DEFUN([PHP_SETUP_ICU],[

      ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io icu-i18n`
      ICU_INCS=`$PKG_CONFIG --cflags-only-I icu-uc icu-io icu-i18n`
-      ICU_CXXFLAGS=`$PKG_CONFIG --variable=CXXFLAGS icu-uc`
-      ICU_CXXFLAGS="$ICU_CXXFLAGS -DU_USING_ICU_NAMESPACE=1"
+      ICU_CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"

      AC_MSG_RESULT([found $ICU_VERSION])

@@ -107,7 +107,7 @@ int zend_sprintf(char *buffer, const char *format, ...);

 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=31
+PHP_RELEASE_VERSION=22
 PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
@@ -57,9 +57,9 @@ bc_str2num (bc_num *num, char *str, int scale)
  zero_int = FALSE;
  if ( (*ptr == '+') || (*ptr == '-'))  ptr++;  /* Sign */
  while (*ptr == '0') ptr++;			/* Skip leading zeros. */
-  while (*ptr >= '0' && *ptr <= '9') ptr++, digits++;	/* digits */
+  while (isdigit((int)*ptr)) ptr++, digits++;	/* digits */
  if (*ptr == '.') ptr++;			/* decimal point */
-  while (*ptr >= '0' && *ptr <= '9') ptr++, strscale++;	/* digits */
+  while (isdigit((int)*ptr)) ptr++, strscale++;	/* digits */
  if ((*ptr != '\0') || (digits+strscale == 0))
    {
      *num = bc_copy_num (BCG(_zero_));
@@ -1,13 +0,0 @@
--TEST--
-Bug #78878 (Buffer underflow in bc_shift_addsub)
--SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
--FILE--
-<?php
-print @bcmul("\xB26483605105519922841849335928742092", bcpowmod(2, 65535, -4e-4));
-?>
--EXPECT--
-bc math warning: non-zero scale in modulus
-0
@@ -127,11 +127,6 @@ static void com_write_dimension(zval *object, zval *offset, zval *value)

 	obj = CDNO_FETCH(object);

-	if (offset == NULL) {
-		php_com_throw_exception(DISP_E_BADINDEX, "appending to variants is not supported");
-		return;
-	}
-
 	if (V_VT(&obj->v) == VT_DISPATCH) {
 		ZVAL_COPY_VALUE(&args[0], offset);
 		ZVAL_COPY_VALUE(&args[1], value);
@@ -1,19 +0,0 @@
--TEST--
-Bug #78694 (Appending to a variant array causes segfault)
--SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
--FILE--
-<?php
-foreach ([new com('WScript.Shell'), new variant([])] as $var) {
-    try {
-        $var[] = 42;
-    } catch (com_exception $ex) {
-        var_dump($ex->getMessage());
-    }
-}
-?>
--EXPECT--
-string(38) "appending to variants is not supported"
-string(38) "appending to variants is not supported"
@@ -1,34 +0,0 @@
--TEST--
-Bug #78775: TLS issues from HTTP request affecting other encrypted connections
--SKIPIF--
-<?php
-if (!extension_loaded('curl')) die('skip Requires curl');
-if (getenv('SKIP_ONLINE_TESTS')) die('skip Online test');
-?>
--FILE--
-<?php
-
-$sock = fsockopen("tls://google.com", 443);
-
-var_dump($sock);
-
-$handle = curl_init('https://self-signed.badssl.com/');
-curl_setopt_array(
-    $handle,
-    [
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_SSL_VERIFYPEER => true,
-    ]
-);
-
-var_dump(curl_exec($handle));
-curl_close($handle);
-
-fwrite($sock, "GET / HTTP/1.0\n\n");
-var_dump(fread($sock, 8));
-
-?>
--EXPECTF--
-resource(%d) of type (stream)
-bool(false)
-string(8) "HTTP/1.0"
@@ -2925,7 +2925,7 @@ static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht
 	timelib_tzinfo   *tzi;
 	php_timezone_obj *tzobj;

-	z_date = zend_hash_str_find(myht, "date", sizeof("date")-1);
+	z_date = zend_hash_str_find(myht, "date", sizeof("data")-1);
 	if (z_date && Z_TYPE_P(z_date) == IS_STRING) {
 		z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1);
 		if (z_timezone_type && Z_TYPE_P(z_timezone_type) == IS_LONG) {
@@ -4364,20 +4364,6 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter
 		} \
 	} while (0);

-#define PHP_DATE_INTERVAL_READ_PROPERTY_DAYS(member) \
-	do { \
-		zval *z_arg = zend_hash_str_find(myht, "days", sizeof("days") - 1); \
-		if (z_arg && Z_TYPE_P(z_arg) == IS_FALSE) { \
-			(*intobj)->diff->member = -99999; \
-		} else if (z_arg && Z_TYPE_P(z_arg) <= IS_STRING) { \
-			zend_string *str = zval_get_string(z_arg); \
-			DATE_A64I((*intobj)->diff->member, ZSTR_VAL(str)); \
-			zend_string_release(str); \
-		} else { \
-			(*intobj)->diff->member = -1LL; \
-		} \
-	} while (0);
-
 #define PHP_DATE_INTERVAL_READ_PROPERTY_DOUBLE(element, member, def) \
 	do { \
 		zval *z_arg = zend_hash_str_find(myht, element, sizeof(element) - 1); \
@@ -4406,7 +4392,7 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter
 	PHP_DATE_INTERVAL_READ_PROPERTY("weekday_behavior", weekday_behavior, int, -1)
 	PHP_DATE_INTERVAL_READ_PROPERTY("first_last_day_of", first_last_day_of, int, -1)
 	PHP_DATE_INTERVAL_READ_PROPERTY("invert", invert, int, 0);
-	PHP_DATE_INTERVAL_READ_PROPERTY_DAYS(days);
+	PHP_DATE_INTERVAL_READ_PROPERTY_I64("days", days);
 	PHP_DATE_INTERVAL_READ_PROPERTY("special_type", special.type, unsigned int, 0);
 	PHP_DATE_INTERVAL_READ_PROPERTY_I64("special_amount", special.amount);
 	PHP_DATE_INTERVAL_READ_PROPERTY("have_weekday_relative", have_weekday_relative, unsigned int, 0);
@@ -5171,7 +5157,7 @@ static HashTable *date_object_get_properties_period(zval *object) /* {{{ */

 	if (period_obj->start) {
 		php_date_obj *date_obj;
-		object_init_ex(&zv, period_obj->start_ce);
+		object_init_ex(&zv, date_ce_date);
 		date_obj = Z_PHPDATE_P(&zv);
 		date_obj->time = timelib_time_clone(period_obj->start);
 	} else {
@@ -5181,7 +5167,7 @@ static HashTable *date_object_get_properties_period(zval *object) /* {{{ */

 	if (period_obj->current) {
 		php_date_obj *date_obj;
-		object_init_ex(&zv, period_obj->start_ce);
+		object_init_ex(&zv, date_ce_date);
 		date_obj = Z_PHPDATE_P(&zv);
 		date_obj->time = timelib_time_clone(period_obj->current);
 	} else {
@@ -5191,7 +5177,7 @@ static HashTable *date_object_get_properties_period(zval *object) /* {{{ */

 	if (period_obj->end) {
 		php_date_obj *date_obj;
-		object_init_ex(&zv, period_obj->start_ce);
+		object_init_ex(&zv, date_ce_date);
 		date_obj = Z_PHPDATE_P(&zv);
 		date_obj->time = timelib_time_clone(period_obj->end);
 	} else {
@@ -5228,7 +5214,7 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash

 	ht_entry = zend_hash_str_find(myht, "start", sizeof("start")-1);
 	if (ht_entry) {
-		if (Z_TYPE_P(ht_entry) == IS_OBJECT && instanceof_function(Z_OBJCE_P(ht_entry), date_ce_interface)) {
+		if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) {
 			php_date_obj *date_obj;
 			date_obj = Z_PHPDATE_P(ht_entry);
 			period_obj->start = timelib_time_clone(date_obj->time);
@@ -5242,7 +5228,7 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash

 	ht_entry = zend_hash_str_find(myht, "end", sizeof("end")-1);
 	if (ht_entry) {
-		if (Z_TYPE_P(ht_entry) == IS_OBJECT && instanceof_function(Z_OBJCE_P(ht_entry), date_ce_interface)) {
+		if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) {
 			php_date_obj *date_obj;
 			date_obj = Z_PHPDATE_P(ht_entry);
 			period_obj->end = timelib_time_clone(date_obj->time);
@@ -5255,7 +5241,7 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash

 	ht_entry = zend_hash_str_find(myht, "current", sizeof("current")-1);
 	if (ht_entry) {
-		if (Z_TYPE_P(ht_entry) == IS_OBJECT && instanceof_function(Z_OBJCE_P(ht_entry), date_ce_interface)) {
+		if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) {
 			php_date_obj *date_obj;
 			date_obj = Z_PHPDATE_P(ht_entry);
 			period_obj->current = timelib_time_clone(date_obj->time);
@@ -39,7 +39,7 @@ DateInterval Object
    [weekday_behavior] => 0
    [first_last_day_of] => 0
    [invert] => 0
-    [days] => 
+    [days] => 0
    [special_type] => 0
    [special_amount] => 0
    [have_weekday_relative] => 0
@@ -136,7 +136,7 @@ object(DatePeriod)#5 (6) {
    ["invert"]=>
    int(0)
    ["days"]=>
-    bool(false)
+    int(0)
    ["special_type"]=>
    int(0)
    ["special_amount"]=>
@@ -71,7 +71,7 @@ object(DateInterval)#2 (16) {
  ["invert"]=>
  int(0)
  ["days"]=>
-  bool(false)
+  int(0)
  ["special_type"]=>
  int(0)
  ["special_amount"]=>
@@ -1,14 +0,0 @@
--TEST--
-Bug #70153 (\DateInterval incorrectly unserialized)
--FILE--
-<?php
-$i1 = \DateInterval::createFromDateString('+1 month');
-$i2 = unserialize(serialize($i1));
-var_dump($i1->days, $i2->days);
-var_dump($i2->special_amount, $i2->special_amount);
-?>
--EXPECT--
-bool(false)
-bool(false)
-int(0)
-int(0)
@@ -1,16 +0,0 @@
--TEST--
-Bug #78751 (Serialising DatePeriod converts DateTimeImmutable)
--FILE--
-<?php
-$oDay = new DateTimeImmutable('2019-10-25');
-$oDateInterval = DateInterval::createFromDateString('1 day');
-$oDays = new DatePeriod($oDay, $oDateInterval, $oDay->modify('+1 day'));
-$oDays = unserialize(serialize($oDays));
-var_dump(
-    $oDays->start instanceof DateTimeImmutable,
-    $oDays->end instanceof DateTimeImmutable
-);
-?>
--EXPECT--
-bool(true)
-bool(true)
@@ -341,7 +341,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval)

 	str = zval_get_string(newval);

-	handler = xmlFindCharEncodingHandler(ZSTR_VAL(str));
+	handler = xmlFindCharEncodingHandler(Z_STRVAL_P(newval));

    if (handler != NULL) {
 		xmlCharEncCloseFunc(handler);
@@ -21,6 +21,6 @@ domdocumentloadxml_test_method.php
 --EXPECTF--
 Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s

-Warning: DOMDocument::load%r(XML){0,1}%r(): %rexpected '>'|Opening and ending tag mismatch: book line 5 and books%r %s
+Warning: DOMDocument::load%r(XML){0,1}%r(): expected '>' %s

-Warning: DOMDocument::load%r(XML){0,1}%r(): %rPremature end of data in tag books|EndTag: '<\/' not found in Entity, line: 13%r %s
+Warning: DOMDocument::load%r(XML){0,1}%r(): Premature end of data in tag books %s
@@ -21,6 +21,6 @@ domdocumentload_test_method.php
 --EXPECTF--
 Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s

-Warning: DOMDocument::load%r(XML){0,1}%r(): %rexpected '>'|Opening and ending tag mismatch: book line 5 and books%r %s
+Warning: DOMDocument::load%r(XML){0,1}%r(): expected '>' %s

-Warning: DOMDocument::load%r(XML){0,1}%r(): %rPremature end of data in tag books|EndTag: '<\/' not found%r %s
+Warning: DOMDocument::load%r(XML){0,1}%r(): Premature end of data in tag books %s
@@ -1,14 +0,0 @@
--TEST--
-Bug #77569 (Write Access Violation in DomImplementation)
--SKIPIF--
-<?php
-if (!extension_loaded('dom')) die('skip dom extension not available');
-?>
--FILE--
-<?php
-$imp = new DOMImplementation;
-$dom = $imp->createDocument("", "");
-$dom->encoding = null;
-?>
--EXPECTF--
-Warning: main(): Invalid Document Encoding in %s on line %d
@@ -1002,6 +1002,7 @@ static tag_info_array tag_table_VND_PANASONIC = {
  { 0x0001, "Quality"},
  { 0x0002, "FirmwareVersion"},
  { 0x0003, "WhiteBalance"},
+  { 0x0004, "0x0004"},
  { 0x0007, "FocusMode"},
  { 0x000f, "AFMode"},
  { 0x001a, "ImageStabilization"},
@@ -1009,10 +1010,12 @@ static tag_info_array tag_table_VND_PANASONIC = {
  { 0x001f, "ShootingMode"},
  { 0x0020, "Audio"},
  { 0x0021, "DataDump"},
+  { 0x0022, "0x0022"},
  { 0x0023, "WhiteBalanceBias"},
  { 0x0024, "FlashBias"},
  { 0x0025, "InternalSerialNumber"},
  { 0x0026, "ExifVersion"},
+  { 0x0027, "0x0027"},
  { 0x0028, "ColorEffect"},
  { 0x0029, "TimeSincePowerOn"},
  { 0x002a, "BurstMode"},
@@ -1020,6 +1023,7 @@ static tag_info_array tag_table_VND_PANASONIC = {
  { 0x002c, "Contrast"},
  { 0x002d, "NoiseReduction"},
  { 0x002e, "SelfTimer"},
+  { 0x002f, "0x002f"},
  { 0x0030, "Rotation"},
  { 0x0031, "AFAssistLamp"},
  { 0x0032, "ColorMode"},
@@ -1086,6 +1090,7 @@ static tag_info_array tag_table_VND_PANASONIC = {
  { 0x00a3, "ClearRetouchValue"},
  { 0x00ab, "TouchAE"},
  { 0x0e00, "PrintIM"},
+  { 0x4449, "0x4449"},
  { 0x8000, "MakerNoteVersion"},
  { 0x8001, "SceneMode"},
  { 0x8004, "WBRedLevel"},
@@ -1120,20 +1125,22 @@ static tag_info_array tag_table_VND_SONY = {
  { 0x0112, "WhiteBalanceFineTune"},
  { 0x0114, "CameraSettings"},
  { 0x0115, "WhiteBalance"},
-  { 0x0116, "ExtraInfo"},
+  { 0x0116, "0x0116"},
  { 0x0e00, "PrintIM"},
  { 0x1000, "MultiBurstMode"},
  { 0x1001, "MultiBurstImageWidth"},
  { 0x1002, "MultiBurstImageHeight"},
  { 0x1003, "Panorama"},
+  { 0x2000, "0x2000"},
  { 0x2001, "PreviewImage"},
-  { 0x2002, "Rating"},
+  { 0x2002, "0x2002"},
+  { 0x2003, "0x2003"},
  { 0x2004, "Contrast"},
  { 0x2005, "Saturation"},
-  { 0x2006, "Sharpness"},
-  { 0x2007, "Brightness"},
-  { 0x2008, "LongExposureNoiseReduction"},
-  { 0x2009, "HighISONoiseReduction"},
+  { 0x2006, "0x2006"},
+  { 0x2007, "0x2007"},
+  { 0x2008, "0x2008"},
+  { 0x2009, "0x2009"},
  { 0x200a, "AutoHDR"},
  { 0x3000, "ShotInfo"},
  { 0xb000, "FileFormat"},
@@ -1160,9 +1167,8 @@ static tag_info_array tag_table_VND_SONY = {
  { 0xb049, "ReleaseMode"},
  { 0xb04a, "SequenceNumber"},
  { 0xb04b, "AntiBlur"},
-  { 0xb04e, "FocusMode"},
+  { 0xb04e, "LongExposureNoiseReduction"},
  { 0xb04f, "DynamicRangeOptimizer"},
-  { 0xb050, "HighISONoiseReduction2"},
  { 0xb052, "IntelligentAuto"},
  { 0xb054, "WhiteBalance2"},
  TAG_TABLE_END
@@ -1267,6 +1273,7 @@ static tag_info_array tag_table_VND_MINOLTA = {
  { 0x0100, "SceneMode"},
  { 0x0101, "ColorMode"},
  { 0x0102, "Quality"},
+  { 0x0103, "0x0103"},
  { 0x0104, "FlashExposureComp"},
  { 0x0105, "Teleconverter"},
  { 0x0107, "ImageStabilization"},
@@ -1362,7 +1369,6 @@ static const maker_note_type maker_note_array[] = {
  { tag_table_VND_PANASONIC, "Panasonic",               NULL, "Panasonic\x00\x00\x00",			 12, 12, MN_ORDER_NORMAL,   MN_OFFSET_NORMAL},
  { tag_table_VND_DJI,       "DJI",                     NULL, NULL,								 0, 0,   MN_ORDER_NORMAL,   MN_OFFSET_NORMAL},
  { tag_table_VND_SONY,      "SONY",                    NULL, "SONY DSC \x00\x00\x00",	         12, 12, MN_ORDER_NORMAL,   MN_OFFSET_NORMAL},
-  { tag_table_VND_SONY,      "SONY",                    NULL,								     0, 0,   MN_ORDER_NORMAL,   MN_OFFSET_NORMAL},
  { tag_table_VND_PENTAX,    "PENTAX",                  NULL, "AOC\x00",						 6,  6,  MN_ORDER_NORMAL,   MN_OFFSET_NORMAL},
  { tag_table_VND_MINOLTA,   "Minolta, KONICA MINOLTA", NULL, NULL,								 0,  0,  MN_ORDER_NORMAL,   MN_OFFSET_NORMAL},
  { tag_table_VND_SIGMA,     "SIGMA, FOVEON",           NULL, "SIGMA\x00\x00\x00",				 10, 10, MN_ORDER_NORMAL,   MN_OFFSET_NORMAL},
@@ -2322,11 +2328,14 @@ static void exif_iif_free(image_info_type *image_info, int section_index) {
 				efree(f);
 			}
 			switch(image_info->info_list[section_index].list[i].format) {
-				case TAG_FMT_UNDEFINED:
-				case TAG_FMT_STRING:
 				case TAG_FMT_SBYTE:
 				case TAG_FMT_BYTE:
+					/* in contrast to strings bytes do not need to allocate buffer for NULL if length==0 */
+					if (image_info->info_list[section_index].list[i].length<1)
+						break;
 				default:
+				case TAG_FMT_UNDEFINED:
+				case TAG_FMT_STRING:
 					if ((f=image_info->info_list[section_index].list[i].value.s) != NULL) {
 						efree(f);
 					}
@@ -3165,8 +3174,7 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 			continue;
 		if (maker_note->model && (!ImageInfo->model || strcmp(maker_note->model, ImageInfo->model)))
 			continue;
-		if (maker_note->id_string && value_len >= maker_note->id_string_len
-				&& strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
+		if (maker_note->id_string && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
 			continue;
 		break;
 	}
@@ -3240,9 +3248,8 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 	}

 	for (de=0;de<NumDirEntries;de++) {
-		size_t offset = 2 + 12 * de;
-		if (!exif_process_IFD_TAG(ImageInfo, dir_start + offset,
-								  offset_base, data_len - offset, displacement, section_index, 0, maker_note->tag_table)) {
+		if (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 * de,
+								  offset_base, data_len, displacement, section_index, 0, maker_note->tag_table)) {
 			return FALSE;
 		}
 	}
@@ -3255,14 +3262,6 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 }
 /* }}} */

-#define REQUIRE_NON_EMPTY() do { \
-	if (byte_count == 0) { \
-		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Cannot be empty", tag, exif_get_tagname(tag, tagname, -12, tag_table)); \
-		return FALSE; \
-	} \
-} while (0)
-
-
 /* {{{ exif_process_IFD_TAG
 * Process one of the nested IFDs directories. */
 static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, char *offset_base, size_t IFDlength, size_t displacement, int section_index, int ReadNextIFD, tag_table_type tag_table)
@@ -3296,6 +3295,11 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 		/*return TRUE;*/
 	}

+	if (components <= 0) {
+		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%d)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);
+		return FALSE;
+	}
+
 	byte_count_signed = (int64_t)components * php_tiff_bytes_per_format[format];

 	if (byte_count_signed < 0 || (byte_count_signed > INT32_MAX)) {
@@ -3375,12 +3379,8 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 	}
 #endif

-	/* NB: The following code may not assume that there is at least one component!
-	 * byte_count may be zero! */
-
 	if (section_index==SECTION_THUMBNAIL) {
 		if (!ImageInfo->Thumbnail.data) {
-			REQUIRE_NON_EMPTY();
 			switch(tag) {
 				case TAG_IMAGEWIDTH:
 				case TAG_COMP_IMAGE_WIDTH:
@@ -3424,9 +3424,6 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 				if (byte_count>1 && (length=php_strnlen(value_ptr, byte_count)) > 0) {
 					if (length<byte_count-1) {
 						/* When there are any characters after the first NUL */
-						EFREE_IF(ImageInfo->CopyrightPhotographer);
-						EFREE_IF(ImageInfo->CopyrightEditor);
-						EFREE_IF(ImageInfo->Copyright);
 						ImageInfo->CopyrightPhotographer  = estrdup(value_ptr);
 						ImageInfo->CopyrightEditor        = estrndup(value_ptr+length+1, byte_count-length-1);
 						spprintf(&ImageInfo->Copyright, 0, "%s, %s", ImageInfo->CopyrightPhotographer, ImageInfo->CopyrightEditor);
@@ -3434,7 +3431,6 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 						/* but we are not supposed to change this                   */
 						/* keep in mind that image_info does not store editor value */
 					} else {
-						EFREE_IF(ImageInfo->Copyright);
 						ImageInfo->Copyright = estrndup(value_ptr, byte_count);
 					}
 				}
@@ -3463,7 +3459,6 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 			case TAG_FNUMBER:
 				/* Simplest way of expressing aperture, so I trust it the most.
 				   (overwrite previously computed value if there is one) */
-				REQUIRE_NON_EMPTY();
 				ImageInfo->ApertureFNumber = (float)exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel);
 				break;

@@ -3472,7 +3467,6 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 				/* More relevant info always comes earlier, so only use this field if we don't
 				   have appropriate aperture information yet. */
 				if (ImageInfo->ApertureFNumber == 0) {
-					REQUIRE_NON_EMPTY();
 					ImageInfo->ApertureFNumber
 						= (float)exp(exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel)*log(2)*0.5);
 				}
@@ -3484,7 +3478,6 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 				   SHUTTERSPEED comes after EXPOSURE TIME
 				  */
 				if (ImageInfo->ExposureTime == 0) {
-					REQUIRE_NON_EMPTY();
 					ImageInfo->ExposureTime
 						= (float)(1/exp(exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel)*log(2)));
 				}
@@ -3494,24 +3487,20 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 				break;

 			case TAG_COMP_IMAGE_WIDTH:
-				REQUIRE_NON_EMPTY();
 				ImageInfo->ExifImageWidth = exif_convert_any_to_int(value_ptr, exif_rewrite_tag_format_to_unsigned(format), ImageInfo->motorola_intel);
 				break;

 			case TAG_FOCALPLANE_X_RES:
-				REQUIRE_NON_EMPTY();
 				ImageInfo->FocalplaneXRes = exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel);
 				break;

 			case TAG_SUBJECT_DISTANCE:
 				/* Inidcates the distacne the autofocus camera is focused to.
 				   Tends to be less accurate as distance increases. */
-				REQUIRE_NON_EMPTY();
 				ImageInfo->Distance = (float)exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel);
 				break;

 			case TAG_FOCALPLANE_RESOLUTION_UNIT:
-				REQUIRE_NON_EMPTY();
 				switch((int)exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel)) {
 					case 1: ImageInfo->FocalplaneUnits = 25.4; break; /* inch */
 					case 2:
@@ -3537,11 +3526,9 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 				break;

 			case TAG_MAKE:
-				EFREE_IF(ImageInfo->make);
 				ImageInfo->make = estrndup(value_ptr, byte_count);
 				break;
 			case TAG_MODEL:
-				EFREE_IF(ImageInfo->model);
 				ImageInfo->model = estrndup(value_ptr, byte_count);
 				break;

@@ -3556,7 +3543,6 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 			case TAG_GPS_IFD_POINTER:
 			case TAG_INTEROP_IFD_POINTER:
 				if (ReadNextIFD) {
-					REQUIRE_NON_EMPTY();
 					char *Subdir_start;
 					int sub_section_index = 0;
 					switch(tag) {
@@ -3585,11 +3571,9 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 					Subdir_start = offset_base + php_ifd_get32u(value_ptr, ImageInfo->motorola_intel);
 					if (Subdir_start < offset_base || Subdir_start > offset_base+IFDlength) {
 						exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Illegal IFD Pointer");
-						EFREE_IF(outside);
 						return FALSE;
 					}
 					if (!exif_process_IFD_in_JPEG(ImageInfo, Subdir_start, offset_base, IFDlength, displacement, sub_section_index, tag)) {
-						EFREE_IF(outside);
 						return FALSE;
 					}
 #ifdef EXIF_DEBUG
@@ -3692,11 +3676,6 @@ static void exif_process_TIFF_in_JPEG(image_info_type *ImageInfo, char *CharBuf,
 {
 	unsigned exif_value_2a, offset_of_ifd;

-	if (length < 2) {
-		exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Missing TIFF alignment marker");
-		return;
-	}
-
 	/* set the thumbnail stuff to nothing so we can test to see if they get set up */
 	if (memcmp(CharBuf, "II", 2) == 0) {
 		ImageInfo->motorola_intel = 0;
@@ -3849,7 +3828,7 @@ static int exif_scan_JPEG_header(image_info_type *ImageInfo)
 			return FALSE;
 		}

-		sn = exif_file_sections_add(ImageInfo, marker, itemlen, NULL);
+		sn = exif_file_sections_add(ImageInfo, marker, itemlen+1, NULL);
 		Data = ImageInfo->file.list[sn].data;

 		/* Store first two pre-read bytes. */
@@ -4605,9 +4584,8 @@ PHP_FUNCTION(exif_read_data)
 		exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "CCDWidth", "%dmm", (int)ImageInfo.CCDWidth);
 	}
 	if(ImageInfo.ExposureTime>0) {
-		float recip_exposure_time = 0.5f + 1.0f/ImageInfo.ExposureTime;
-		if (ImageInfo.ExposureTime <= 0.5 && recip_exposure_time < INT_MAX) {
-			exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s (1/%d)", ImageInfo.ExposureTime, (int) recip_exposure_time);
+		if(ImageInfo.ExposureTime <= 0.5) {
+			exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s (1/%d)", ImageInfo.ExposureTime, (int)(0.5 + 1/ImageInfo.ExposureTime));
 		} else {
 			exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s", ImageInfo.ExposureTime);
 		}
@@ -4,48 +4,9 @@ Bug #68547 (Exif Header component value check error)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-var_dump(exif_read_data(__DIR__ . DIRECTORY_SEPARATOR . 'bug68547.jpg'));
+exif_read_data(__DIR__ . DIRECTORY_SEPARATOR . 'bug68547.jpg');
 ?>
 ===DONE===
 --EXPECTF--
-array(12) {
-  ["FileName"]=>
-  string(12) "bug68547.jpg"
-  ["FileDateTime"]=>
-  int(%d)
-  ["FileSize"]=>
-  int(713)
-  ["FileType"]=>
-  int(2)
-  ["MimeType"]=>
-  string(10) "image/jpeg"
-  ["SectionsFound"]=>
-  string(20) "ANY_TAG, IFD0, WINXP"
-  ["COMPUTED"]=>
-  array(5) {
-    ["html"]=>
-    string(20) "width="1" height="1""
-    ["Height"]=>
-    int(1)
-    ["Width"]=>
-    int(1)
-    ["IsColor"]=>
-    int(1)
-    ["ByteOrderMotorola"]=>
-    int(0)
-  }
-  ["Subject"]=>
-  string(10) "Subjec??.."
-  ["Keywords"]=>
-  string(0) ""
-  ["Author"]=>
-  string(9) "Rui Carmo"
-  ["Comments"]=>
-  string(29) "Comments
-Line2
-Line3
-Line4"
-  ["Title"]=>
-  string(8) "Title..."
-}
+Warning: exif_read_data(bug68547.jpg): Process tag(x9C9E=Keywords   ): Illegal components(%d) in %sbug68547.php on line %d
 ===DONE===
@@ -39,6 +39,7 @@ print_r(exif_read_data(__DIR__.'/bug68799.jpg'));

 ?>
 --EXPECTF--
+Warning: exif_read_data(bug68799.jpg): Process tag(x9C9D=Author     ): Illegal components(%d) in %s on line %d
 Array
 (
    [FileName] => bug68799.jpg
@@ -46,7 +47,7 @@ Array
    [FileSize] => 735
    [FileType] => 2
    [MimeType] => image/jpeg
-    [SectionsFound] => ANY_TAG, IFD0, WINXP
+    [SectionsFound] => ANY_TAG, IFD0
    [COMPUTED] => Array
        (
            [html] => width="1" height="1"
@@ -59,5 +60,4 @@ Array
    [XResolution] => 96/1
    [YResolution] => 96/1
    [ResolutionUnit] => 2
-    [Author] => 
 )
@@ -47,7 +47,7 @@ Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTa): Illegal

 Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTa): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d

-Warning: exif_read_data(bug72094_3.jpg): Illegal IFD size in %s%ebug72094.php on line %d
+Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTa): Illegal components(%d) in %s%ebug72094.php on line %d

 Warning: exif_read_data(bug72094_3.jpg): File structure corrupted in %s%ebug72094.php on line %d

@@ -8,7 +8,7 @@ Bug #73737 (Crash when parsing a tag format)
 	var_dump($exif);
 ?>
 --EXPECTF--
-Warning: exif_thumbnail(bug73737.tiff): Process tag(x0100=ImageWidth ): Cannot be empty in %s on line %d
+Warning: exif_thumbnail(bug73737.tiff): Process tag(x0100=ImageWidth ): Illegal components(0) in %s on line %d

 Warning: exif_thumbnail(bug73737.tiff): Error in TIFF: filesize(x0030) less than start of IFD dir(x10102) in %s line %d
 bool(false)
@@ -70,7 +70,7 @@ Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTa): Illegal f

 Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTa): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d

-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTa): Illegal pointer offset(x30303030 + x30303030 = x60606060 > %s) in %sbug76557.php on line %d
+Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTa): Illegal pointer offset(x30303030 + x30303030 = x60606060 > x00EE) in %sbug76557.php on line %d

 Warning: exif_read_data(bug76557.jpg): File structure corrupted in %sbug76557.php on line %d

@@ -1,12 +0,0 @@
--TEST--
-Bug #78793: Use-after-free in exif parsing under memory sanitizer
--FILE--
-<?php
-$f = "ext/exif/tests/bug77950.tiff";
-for ($i = 0; $i < 10; $i++) {
-    @exif_read_data($f);
-}
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,17 +0,0 @@
--TEST--
-Bug #78910: Heap-buffer-overflow READ in exif (OSS-Fuzz #19044)
--FILE--
-<?php
-
-var_dump(exif_read_data('data:image/jpg;base64,TU0AKgAAAAwgICAgAAIBDwAEAAAAAgAAACKSfCAgAAAAAEZVSklGSUxN'));
-
-?>
--EXPECTF--
-Notice: exif_read_data(): Read from TIFF: tag(0x927C, MakerNote  ): Illegal format code 0x2020, switching to BYTE in %s on line %d
-
-Warning: exif_read_data(): Process tag(x927C=MakerNote  ): Illegal format code 0x2020, suppose BYTE in %s on line %d
-
-Warning: exif_read_data(): IFD data too short: 0x0000 offset 0x000C in %s on line %d
-
-Warning: exif_read_data(): Invalid TIFF file in %s on line %d
-bool(false)
@@ -1,15 +0,0 @@
--TEST--
-Bug #79282: Use-of-uninitialized-value in exif
--FILE--
-<?php
-
-var_dump(exif_read_data('data://image/jpeg;base64,/9jhAAlFeGlmAAAg'));
-
-?>
--EXPECTF--
-Warning: exif_read_data(): Missing TIFF alignment marker in %s on line %d
-
-Warning: exif_read_data(): File structure corrupted in %s on line %d
-
-Warning: exif_read_data(): Invalid JPEG file in %s on line %d
-bool(false)
@@ -1,18 +0,0 @@
--TEST--
-OSS-Fuzz #17474: Memory leak on duplicate Copyright tags
--SKIPIF--
-<?php
-if (!extension_loaded('exif')) {
-    die('skip exif extension not available');
-}
-?>
--FILE--
-<?php
-
-// Only checking for an absence of leaks here.
-@exif_read_data(__DIR__ . '/duplicate_copyright_tag_leak.tiff');
-
-?>
-===DONE===
--EXPECTF--
-===DONE===
@@ -1,21 +0,0 @@
--TEST--
-OSS-Fuzz #17163: Out-of-bounds read due to tag with zero components
--SKIPIF--
-<?php
-if (!extension_loaded('exif')) {
-    die('skip exif extension not available');
-}
-?>
--FILE--
-<?php
-
-var_dump(exif_read_data(__DIR__ . '/tag_with_illegal_zero_components.jpeg'));
-
-?>
--EXPECTF--
-Warning: exif_read_data(tag_with_illegal_zero_components.jpeg): Process tag(x0202=JPEGInterch): Cannot be empty in %s on line %d
-
-Warning: exif_read_data(tag_with_illegal_zero_components.jpeg): File structure corrupted in %s on line %d
-
-Warning: exif_read_data(tag_with_illegal_zero_components.jpeg): Invalid JPEG file in %s on line %d
-bool(false)
@@ -1,16 +0,0 @@
--TEST--
-OSS-Fuzz: Temporary buffer leak in tag reading
--SKIPIF--
-<?php
-if (!extension_loaded('exif')) {
-    die('skip exif extension not available');
-}
-?>
--FILE--
-<?php
-
-var_dump(@exif_read_data(__DIR__ . '/temporary_buffer_leak.jpg'));
-
-?>
--EXPECT--
-bool(false)
@@ -1,17 +0,0 @@
--TEST--
-OSS-Fuzz: Memory leak for zero-length MAKERNOTE
--SKIPIF--
-<?php
-if (!extension_loaded('exif')) {
-    die('skip exif extension not available');
-}
-?>
--FILE--
-<?php
-
-@exif_read_data(__DIR__ . '/zero_length_makernote_leak.tiff');
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1011,9 +1011,8 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
 				goto out;
 			}
 			nelements = CDF_GETUINT32(q, 1);
-			if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) {
-				DPRINTF(("CDF_VECTOR with nelements == %"
-				    SIZE_T_FORMAT "u\n", nelements));
+			if (nelements == 0) {
+				DPRINTF(("CDF_VECTOR with nelements == 0\n"));
 				goto out;
 			}
 			slen = 2;
@@ -1055,6 +1054,8 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
 					goto out;
 				inp += nelem;
 			}
+			DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
+			    nelements));
 			for (j = 0; j < nelements && i < sh.sh_properties;
 			    j++, i++)
 			{
@@ -50,7 +50,6 @@
 typedef int32_t cdf_secid_t;

 #define CDF_LOOP_LIMIT					10000
-#define CDF_ELEMENT_LIMIT				100000

 #define CDF_SECID_NULL					0
 #define CDF_SECID_FREE					-1
@@ -534,7 +534,7 @@ compress(int init_bits, gdIOCtxPtr outfile, gdImagePtr im, GifCtx *ctx)
    output( (code_int)ctx->ClearCode, ctx );

 #ifdef SIGNED_COMPARE_SLOW
-    while ( (c = GIFNextPixel( im, ctx )) != (unsigned) EOF ) {
+    while ( (c = GIFNextPixel( im )) != (unsigned) EOF ) {
 #else /*SIGNED_COMPARE_SLOW*/
    while ( (c = GIFNextPixel( im, ctx )) != EOF ) {  /* } */
 #endif /*SIGNED_COMPARE_SLOW*/
@@ -3,7 +3,7 @@ Bug #77198 (auto cropping has insufficient precision)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
-if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
+if (!GD_BUNDLED) die('upstream bugfix has not been released');
 ?>
 --FILE--
 <?php
@@ -3,7 +3,7 @@ Bug #77198 (threshold cropping has insufficient precision)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
-if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
+if (!GD_BUNDLED) die('upstream bugfix has not been released');
 ?>
 --FILE--
 <?php
@@ -3,7 +3,7 @@ Bug #77200 (imagecropauto(…, GD_CROP_SIDES) crops left but not right)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
-if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
+if (!GD_BUNDLED) die('upstream bugfix has not been released');
 ?>
 --FILE--
 <?php
@@ -286,7 +286,7 @@ PHP_MINIT_FUNCTION(miconv)
 	{
 		static char buf[16];
 		snprintf(buf, sizeof(buf), "%d.%d",
-			_libiconv_version >> 8, _libiconv_version & 0xff);
+		    ((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f));
 		version = buf;
 	}
 #elif HAVE_GLIBC_ICONV
@@ -223,23 +223,11 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
 		UParseError parse_error;

 		status = U_ZERO_ERROR;
-#if defined(__clang__)
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif ZEND_GCC_VERSION >= 4008
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
 		if (mode == INTL_IDN_TO_ASCII) {
 			converted_ret_len = uidna_IDNToASCII(ustring, ustring_len, converted, MAXPATHLEN, (int32_t)option, &parse_error, &status);
 		} else {
 			converted_ret_len = uidna_IDNToUnicode(ustring, ustring_len, converted, MAXPATHLEN, (int32_t)option, &parse_error, &status);
 		}
-#if defined(__clang__)
-# pragma clang diagnostic pop
-#elif ZEND_GCC_VERSION >= 4008
-# pragma GCC diagnostic pop
-#endif
 		efree(ustring);

 		if (U_FAILURE(status)) {
@@ -1292,7 +1292,7 @@ PHP_FUNCTION(locale_filter_matches)
 	if( boolCanonical ){
 		/* canonicalize loc_range */
 		can_loc_range=get_icu_value_internal( loc_range , LOC_CANONICALIZE_TAG , &result , 0);
-		if( result <=0) {
+		if( result ==0) {
 			intl_error_set( NULL, status,
 				"locale_filter_matches : unable to canonicalize loc_range" , 0 );
 			RETURN_FALSE;
@@ -1300,7 +1300,7 @@ PHP_FUNCTION(locale_filter_matches)

 		/* canonicalize lang_tag */
 		can_lang_tag = get_icu_value_internal( lang_tag , LOC_CANONICALIZE_TAG , &result ,  0);
-		if( result <=0) {
+		if( result ==0) {
 			intl_error_set( NULL, status,
 				"locale_filter_matches : unable to canonicalize lang_tag" , 0 );
 			RETURN_FALSE;
@@ -185,10 +185,10 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo,

 		if (name_part.getType() == UMSGPAT_PART_TYPE_ARG_NAME) {
 			UnicodeString argName = mp.getSubstring(name_part);
-			if ((storedType = (Formattable::Type*)zend_hash_str_find_ptr(ret, (char*)argName.getBuffer(), argName.length() * sizeof(UChar))) == NULL) {
+			if ((storedType = (Formattable::Type*)zend_hash_str_find_ptr(ret, (char*)argName.getBuffer(), argName.length())) == NULL) {
 				/* not found already; create new entry in HT */
 				Formattable::Type bogusType = Formattable::kObject;
-				if ((storedType = (Formattable::Type*)zend_hash_str_update_mem(ret, (char*)argName.getBuffer(), argName.length() * sizeof(UChar),
+				if ((storedType = (Formattable::Type*)zend_hash_str_update_mem(ret, (char*)argName.getBuffer(), argName.length(),
 						(void*)&bogusType, sizeof(bogusType))) == NULL) {
 					intl_errors_set(&err, U_MEMORY_ALLOCATION_ERROR,
 						"Write to argument types hash table failed", 0);
@@ -450,7 +450,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo,
 				continue;
 			}

-			storedArgType = (Formattable::Type*)zend_hash_str_find_ptr(types, (char*)key.getBuffer(), key.length() * sizeof(UChar));
+			storedArgType = (Formattable::Type*)zend_hash_str_find_ptr(types, (char*)key.getBuffer(), key.length());
 		}

 		if (storedArgType != NULL) {
@@ -1,13 +0,0 @@
--TEST--
-Bug #78804: Segmentation fault in Locale::filterMatches
--FILE--
-<?php
-
-if (Locale::filterMatches('en-US', 'und', true)) {
-    echo 'Matches';
-} else {
-    echo 'Not matches';
-}
-?>
--EXPECT--
-Not matches
@@ -2,7 +2,6 @@
 grapheme()
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if (version_compare(INTL_ICU_VERSION, '65.0') >= 0) die('skip for ICU < 65.0'); ?>
 --FILE--
 <?php

@@ -3,7 +3,6 @@ locale_get_display_name() icu >= 64.0
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 <?php if (version_compare(INTL_ICU_VERSION, '64.0') < 0) die('skip for ICU >= 64.0'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '65.0') >= 0) die('skip for ICU < 65.0'); ?>
 --FILE--
 <?php

@@ -1,342 +0,0 @@
--TEST--
-locale_get_display_name() icu >= 64.0
--SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if (version_compare(INTL_ICU_VERSION, '65.0') < 0) die('skip for ICU >= 65.0'); ?>
--FILE--
-<?php
-
-/*
- * Try getting the display_name for different locales
- * with Procedural and Object methods.
- */
-
-function ut_main()
-{
-    $res_str='';
-
-	$disp_locales=array('en','fr','de');
-
-    $locales = array(
-        'sl_IT_nedis_KIRTI',
-        'sl_IT_nedis-a-kirti-x-xyz',
-        'sl_IT_rozaj',
-        'sl_IT_NEDIS_ROJAZ_1901',
-        'i-enochian',
-        'zh-hakka',
-        'zh-wuu',
-        'i-tay',
-        'sgn-BE-nl',
-        'sgn-CH-de',
-        'sl_IT_rozaj@currency=EUR',
-        'uk-ua_CALIFORNIA@currency=;currency=GRN',
-        'root',
-        'uk@currency=EURO',
-        'Hindi',
-//Simple language subtag
-        'de',
-        'fr',
-        'ja',
-        'i-enochian', //(example of a grandfathered tag)
-//Language subtag plus Script subtag:
-        'zh-Hant',
-        'zh-Hans',
-        'sr-Cyrl',
-        'sr-Latn',
-//Language-Script-Region
-        'zh-Hans-CN',
-        'sr-Latn-CS',
-//Language-Variant
-        'sl-rozaj',
-        'sl-nedis',
-//Language-Region-Variant
-        'de-CH-1901',
-        'sl-IT-nedis',
-//Language-Script-Region-Variant
-        'sl-Latn-IT-nedis',
-//Language-Region:
-        'de-DE',
-        'en-US',
-        'es-419',
-//Private use subtags:
-        'de-CH-x-phonebk',
-        'az-Arab-x-AZE-derbend',
-//Extended language subtags
-        'zh-min',
-        'zh-min-nan-Hant-CN',
-//Private use registry values
-        'x-whatever',
-        'qaa-Qaaa-QM-x-southern',
-        'sr-Latn-QM',
-        'sr-Qaaa-CS',
-/*Tags that use extensions (examples ONLY: extensions MUST be defined
-   by revision or update to this document or by RFC): */
-        'en-US-u-islamCal',
-        'zh-CN-a-myExt-x-private',
-        'en-a-myExt-b-another',
-//Some Invalid Tags:
-        'de-419-DE',
-        'a-DE',
-        'ar-a-aaa-b-bbb-a-ccc'
-    );
-
-
-    $res_str = '';
-
-   	foreach( $locales as $locale )
-    {
-       	$res_str .= "locale='$locale'\n";
-   		foreach( $disp_locales as $disp_locale )
-    	{
-        	$scr = ut_loc_get_display_name( $locale ,$disp_locale );
-		$scr = str_replace(array('(', ')'), '#', $scr);
-        	$res_str .= "disp_locale=$disp_locale :  display_name=$scr";
-        	$res_str .= "\n";
-		}
-        $res_str .= "-----------------\n";
-    }
-
-    return $res_str;
-
-}
-
-include_once( 'ut_common.inc' );
-ut_run();
-
-?>
--EXPECTREGEX--
-locale='sl_IT_nedis_KIRTI'
-disp_locale=en :  display_name=Slovenian #Italy, NEDIS_KIRTI#
-disp_locale=fr :  display_name=slovène #Italie, NEDIS_KIRTI#
-disp_locale=de :  display_name=Slowenisch #Italien, NEDIS_KIRTI#
-----------------
-locale='sl_IT_nedis-a-kirti-x-xyz'
-disp_locale=en :  display_name=Slovenian #Italy, NEDIS_A_KIRTI_X_XYZ#
-disp_locale=fr :  display_name=slovène #Italie, NEDIS_A_KIRTI_X_XYZ#
-disp_locale=de :  display_name=Slowenisch #Italien, NEDIS_A_KIRTI_X_XYZ#
-----------------
-locale='sl_IT_rozaj'
-disp_locale=en :  display_name=Slovenian #Italy, Resian#
-disp_locale=fr :  display_name=slovène #Italie, dialecte de Resia#
-disp_locale=de :  display_name=Slowenisch #Italien, (ROZAJ|Resianisch)#
-----------------
-locale='sl_IT_NEDIS_ROJAZ_1901'
-disp_locale=en :  display_name=Slovenian #Italy, NEDIS_ROJAZ_1901#
-disp_locale=fr :  display_name=slovène #Italie, NEDIS_ROJAZ_1901#
-disp_locale=de :  display_name=Slowenisch #Italien, NEDIS_ROJAZ_1901#
-----------------
-locale='i-enochian'
-disp_locale=en :  display_name=i-enochian #Private-Use=i-enochian#
-disp_locale=fr :  display_name=i-enochian #usage privé=i-enochian#
-disp_locale=de :  display_name=i-enochian #Privatnutzung=i-enochian#
-----------------
-locale='zh-hakka'
-disp_locale=en :  display_name=Chinese( #HAKKA#)?
-disp_locale=fr :  display_name=chinois( #HAKKA#)?
-disp_locale=de :  display_name=Chinesisch( #HAKKA#)?
-----------------
-locale='zh-wuu'
-disp_locale=en :  display_name=Chinese #WUU#
-disp_locale=fr :  display_name=chinois #WUU#
-disp_locale=de :  display_name=Chinesisch #WUU#
-----------------
-locale='i-tay'
-disp_locale=en :  display_name=i-tay
-disp_locale=fr :  display_name=i-tay
-disp_locale=de :  display_name=i-tay
-----------------
-locale='sgn-BE-nl'
-disp_locale=en :  display_name=sgn #Belgium, NL#
-disp_locale=fr :  display_name=sgn #Belgique, NL#
-disp_locale=de :  display_name=sgn #Belgien, NL#
-----------------
-locale='sgn-CH-de'
-disp_locale=en :  display_name=sgn #Switzerland, DE#
-disp_locale=fr :  display_name=sgn #Suisse, DE#
-disp_locale=de :  display_name=sgn #Schweiz, DE#
-----------------
-locale='sl_IT_rozaj@currency=EUR'
-disp_locale=en :  display_name=Slovenian #Italy, Resian, [Cc]urrency=Euro#
-disp_locale=fr :  display_name=slovène #Italie, dialecte de Resia, [Dd]evise=euro#
-disp_locale=de :  display_name=Slowenisch #Italien, (ROZAJ|Resianisch), Währung=Euro#
-----------------
-locale='uk-ua_CALIFORNIA@currency=;currency=GRN'
-disp_locale=en :  display_name=
-disp_locale=fr :  display_name=
-disp_locale=de :  display_name=
-----------------
-locale='root'
-disp_locale=en :  display_name=Unknown language
-disp_locale=fr :  display_name=langue indéterminée
-disp_locale=de :  display_name=Unbekannte Sprache
-----------------
-locale='uk@currency=EURO'
-disp_locale=en :  display_name=Ukrainian #[Cc]urrency=EURO#
-disp_locale=fr :  display_name=ukrainien #[Dd]evise=EURO#
-disp_locale=de :  display_name=Ukrainisch #Währung=EURO#
-----------------
-locale='Hindi'
-disp_locale=en :  display_name=hindi
-disp_locale=fr :  display_name=hindi
-disp_locale=de :  display_name=hindi
-----------------
-locale='de'
-disp_locale=en :  display_name=German
-disp_locale=fr :  display_name=allemand
-disp_locale=de :  display_name=Deutsch
-----------------
-locale='fr'
-disp_locale=en :  display_name=French
-disp_locale=fr :  display_name=français
-disp_locale=de :  display_name=Französisch
-----------------
-locale='ja'
-disp_locale=en :  display_name=Japanese
-disp_locale=fr :  display_name=japonais
-disp_locale=de :  display_name=Japanisch
-----------------
-locale='i-enochian'
-disp_locale=en :  display_name=i-enochian #Private-Use=i-enochian#
-disp_locale=fr :  display_name=i-enochian #usage privé=i-enochian#
-disp_locale=de :  display_name=i-enochian #Privatnutzung=i-enochian#
-----------------
-locale='zh-Hant'
-disp_locale=en :  display_name=Chinese #Traditional#
-disp_locale=fr :  display_name=chinois #traditionnel#
-disp_locale=de :  display_name=Chinesisch #Traditionell#
-----------------
-locale='zh-Hans'
-disp_locale=en :  display_name=Chinese #Simplified#
-disp_locale=fr :  display_name=chinois #simplifié#
-disp_locale=de :  display_name=Chinesisch #Vereinfacht#
-----------------
-locale='sr-Cyrl'
-disp_locale=en :  display_name=Serbian #Cyrillic#
-disp_locale=fr :  display_name=serbe #cyrillique#
-disp_locale=de :  display_name=Serbisch #Kyrillisch#
-----------------
-locale='sr-Latn'
-disp_locale=en :  display_name=Serbian #Latin#
-disp_locale=fr :  display_name=serbe #latin#
-disp_locale=de :  display_name=Serbisch #Lateinisch#
-----------------
-locale='zh-Hans-CN'
-disp_locale=en :  display_name=Chinese #Simplified, China#
-disp_locale=fr :  display_name=chinois #simplifié, Chine#
-disp_locale=de :  display_name=Chinesisch #Vereinfacht, China#
-----------------
-locale='sr-Latn-CS'
-disp_locale=en :  display_name=Serbian #Latin, Serbia#
-disp_locale=fr :  display_name=serbe #latin, Serbie#
-disp_locale=de :  display_name=Serbisch #Lateinisch, Serbien#
-----------------
-locale='sl-rozaj'
-disp_locale=en :  display_name=Slovenian #Resian#
-disp_locale=fr :  display_name=slovène #dialecte de Resia#
-disp_locale=de :  display_name=Slowenisch( #(ROZAJ|Resianisch)#)?
-----------------
-locale='sl-nedis'
-disp_locale=en :  display_name=Slovenian #Natisone dialect#
-disp_locale=fr :  display_name=slovène #dialecte de Natisone#
-disp_locale=de :  display_name=Slowenisch #Natisone-Dialekt#
-----------------
-locale='de-CH-1901'
-disp_locale=en :  display_name=German #Switzerland, Traditional German orthography#
-disp_locale=fr :  display_name=allemand #Suisse, orthographe allemande traditionnelle#
-disp_locale=de :  display_name=Deutsch #Schweiz, (1901|[aA]lte deutsche Rechtschreibung)#
-----------------
-locale='sl-IT-nedis'
-disp_locale=en :  display_name=Slovenian #Italy, Natisone dialect#
-disp_locale=fr :  display_name=slovène #Italie, dialecte de Natisone#
-disp_locale=de :  display_name=Slowenisch #Italien, (NEDIS|Natisone-Dialekt)#
-----------------
-locale='sl-Latn-IT-nedis'
-disp_locale=en :  display_name=Slovenian #Latin, Italy, Natisone dialect#
-disp_locale=fr :  display_name=slovène #latin, Italie, dialecte de Natisone#
-disp_locale=de :  display_name=Slowenisch #Lateinisch, Italien, (NEDIS|Natisone-Dialekt)#
-----------------
-locale='de-DE'
-disp_locale=en :  display_name=German #Germany#
-disp_locale=fr :  display_name=allemand #Allemagne#
-disp_locale=de :  display_name=Deutsch #Deutschland#
-----------------
-locale='en-US'
-disp_locale=en :  display_name=English #United States#
-disp_locale=fr :  display_name=anglais #États-Unis#
-disp_locale=de :  display_name=Englisch #Vereinigte Staaten#
-----------------
-locale='es-419'
-disp_locale=en :  display_name=Spanish #Latin America#
-disp_locale=fr :  display_name=espagnol #Amérique latine#
-disp_locale=de :  display_name=Spanisch #Lateinamerika#
-----------------
-locale='de-CH-x-phonebk'
-disp_locale=en :  display_name=German #Switzerland, Private-Use=phonebk#
-disp_locale=fr :  display_name=allemand #Suisse, usage privé=phonebk#
-disp_locale=de :  display_name=Deutsch #Schweiz, Privatnutzung=phonebk#
-----------------
-locale='az-Arab-x-AZE-derbend'
-disp_locale=en :  display_name=Azerbaijani #Arabic, Private-Use=aze-derbend#
-disp_locale=fr :  display_name=azéri #arabe, usage privé=aze-derbend#
-disp_locale=de :  display_name=Aserbaidschanisch #Arabisch, Privatnutzung=aze-derbend#
-----------------
-locale='zh-min'
-disp_locale=en :  display_name=Chinese #MIN#
-disp_locale=fr :  display_name=chinois #MIN#
-disp_locale=de :  display_name=Chinesisch #MIN#
-----------------
-locale='zh-min-nan-Hant-CN'
-disp_locale=en :  display_name=Chinese #MIN, NAN_HANT_CN#
-disp_locale=fr :  display_name=chinois #MIN, NAN_HANT_CN#
-disp_locale=de :  display_name=Chinesisch #MIN, NAN_HANT_CN#
-----------------
-locale='x-whatever'
-disp_locale=en :  display_name=x-whatever #Private-Use=whatever#
-disp_locale=fr :  display_name=x-whatever #usage privé=whatever#
-disp_locale=de :  display_name=x-whatever #Privatnutzung=whatever#
-----------------
-locale='qaa-Qaaa-QM-x-southern'
-disp_locale=en :  display_name=qaa #Qaaa, QM, Private-Use=southern#
-disp_locale=fr :  display_name=qaa #Qaaa, QM, usage privé=southern#
-disp_locale=de :  display_name=qaa #Qaaa, QM, Privatnutzung=southern#
-----------------
-locale='sr-Latn-QM'
-disp_locale=en :  display_name=Serbian #Latin, QM#
-disp_locale=fr :  display_name=serbe #latin, QM#
-disp_locale=de :  display_name=Serbisch #Lateinisch, QM#
-----------------
-locale='sr-Qaaa-CS'
-disp_locale=en :  display_name=Serbian #Qaaa, Serbia#
-disp_locale=fr :  display_name=serbe #Qaaa, Serbie#
-disp_locale=de :  display_name=Serbisch #Qaaa, Serbien#
-----------------
-locale='en-US-u-islamCal'
-disp_locale=en :  display_name=English #United States, attribute=islamcal#
-disp_locale=fr :  display_name=anglais #États-Unis, attribute=islamcal#
-disp_locale=de :  display_name=Englisch #Vereinigte Staaten, attribute=islamcal#
-----------------
-locale='zh-CN-a-myExt-x-private'
-disp_locale=en :  display_name=Chinese #China, a=myext, Private-Use=private#
-disp_locale=fr :  display_name=chinois #Chine, a=myext, usage privé=private#
-disp_locale=de :  display_name=Chinesisch #China, a=myext, Privatnutzung=private#
-----------------
-locale='en-a-myExt-b-another'
-disp_locale=en :  display_name=English #a=myext, b=another#
-disp_locale=fr :  display_name=anglais #a=myext, b=another#
-disp_locale=de :  display_name=Englisch #a=myext, b=another#
-----------------
-locale='de-419-DE'
-disp_locale=en :  display_name=German #Latin America, DE#
-disp_locale=fr :  display_name=allemand #Amérique latine, DE#
-disp_locale=de :  display_name=Deutsch #Lateinamerika, DE#
-----------------
-locale='a-DE'
-disp_locale=en :  display_name=a #Germany#
-disp_locale=fr :  display_name=a #Allemagne#
-disp_locale=de :  display_name=a #Deutschland#
-----------------
-locale='ar-a-aaa-b-bbb-a-ccc'
-disp_locale=en :  display_name=Arabic #a=aaa, b=bbb#
-disp_locale=fr :  display_name=arabe #a=aaa, b=bbb#
-disp_locale=de :  display_name=Arabisch #a=aaa, b=bbb#
-----------------
@@ -3,7 +3,6 @@ Bug #76777 (first parameter of libxml_set_external_entity_loader callback undefi
 --SKIPIF--
 <?php
 if (!extension_loaded('libxml')) die('skip');
-if (!extension_loaded('dom')) die('skip dom extension not available');
 if (getenv("SKIP_ONLINE_TESTS")) die('skip online test');
 ?>
 --FILE--
@@ -138,17 +138,6 @@ static unsigned short cp950_pua_tbl[][4] = {
 	{0xf70f,0xf848,0xc740,0xc8fe},
 };

-static inline int is_in_cp950_pua(int c1, int c) {
-	if ((c1 >= 0xfa && c1 <= 0xfe) || (c1 >= 0x8e && c1 <= 0xa0) ||
-			(c1 >= 0x81 && c1 <= 0x8d) || (c1 >= 0xc7 && c1 <= 0xc8)) {
-		return (c >=0x40 && c <= 0x7e) || (c >= 0xa1 && c <= 0xfe);
-	}
-	if (c1 == 0xc6) {
-		return c >= 0xa1 && c <= 0xfe;
-	}
-	return 0;
-}
-
 /*
 * Big5 => wchar
 */
@@ -197,7 +186,11 @@ mbfl_filt_conv_big5_wchar(int c, mbfl_convert_filter *filter)

 			if (filter->from->no_encoding == mbfl_no_encoding_cp950) {
 				/* PUA for CP950 */
-				if (w <= 0 && is_in_cp950_pua(c1, c)) {
+				if (w <= 0 &&
+					(((c1 >= 0xfa && c1 <= 0xfe) || (c1 >= 0x8e && c1 <= 0xa0) ||
+					  (c1 >= 0x81 && c1 <= 0x8d) ||(c1 >= 0xc7 && c1 <= 0xc8))
+					 && ((c > 0x39 && c < 0x7f) || (c > 0xa0 && c < 0xff))) ||
+					((c1 == 0xc6) && (c > 0xa0 && c < 0xff))) {
 					c2 = c1 << 8 | c;
 					for (k = 0; k < sizeof(cp950_pua_tbl)/(sizeof(unsigned short)*4); k++) {
 						if (c2 >= cp950_pua_tbl[k][2] && c2 <= cp950_pua_tbl[k][3]) {
@@ -414,7 +414,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_decode_numericentity, 0, 0, 2)
 	ZEND_ARG_INFO(0, string)
 	ZEND_ARG_INFO(0, convmap)
 	ZEND_ARG_INFO(0, encoding)
-	ZEND_ARG_INFO(0, is_hex)
 ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_send_mail, 0, 0, 3)
@@ -5027,15 +5026,27 @@ PHP_FUNCTION(mb_check_encoding)
 		RETURN_FALSE;
 	}

-	if (Z_TYPE_P(input) == IS_ARRAY) {
-		if (!php_mb_check_encoding_recursive(HASH_OF(input), enc)) {
+	switch(Z_TYPE_P(input)) {
+		case IS_LONG:
+		case IS_DOUBLE:
+		case IS_NULL:
+		case IS_TRUE:
+		case IS_FALSE:
+			RETURN_TRUE;
+			break;
+		case IS_STRING:
+			if (!php_mb_check_encoding(Z_STRVAL_P(input), Z_STRLEN_P(input), enc ? ZSTR_VAL(enc): NULL)) {
+				RETURN_FALSE;
+			}
+			break;
+		case IS_ARRAY:
+			if (!php_mb_check_encoding_recursive(HASH_OF(input), enc)) {
+				RETURN_FALSE;
+			}
+			break;
+		default:
+			php_error_docref(NULL, E_WARNING, "Input is something other than scalar or array");
 			RETURN_FALSE;
-		}
-	} else {
-		convert_to_string(input);
-		if (!php_mb_check_encoding(Z_STRVAL_P(input), Z_STRLEN_P(input), enc ? ZSTR_VAL(enc): NULL)) {
-			RETURN_FALSE;
-		}
 	}
 	RETURN_TRUE;
 }
@@ -1,20 +0,0 @@
--TEST--
-Bug #78609 (mb_check_encoding() no longer supports stringable objects)
--SKIPIF--
-<?php
-if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
-?>
--FILE--
-<?php
-class Foo
-{
-    public function __toString()
-    {
-        return 'string_representation';
-    }
-}
-
-var_dump(mb_check_encoding(new Foo, 'UTF-8'));
-?>
--EXPECT--
-bool(true)
@@ -1,10 +0,0 @@
--TEST--
-Bug #79037: global buffer-overflow in `mbfl_filt_conv_big5_wchar`
--FILE--
-<?php
-
-var_dump(mb_convert_encoding("\x81\x3a", "UTF-8", "CP950"));
-
-?>
--EXPECT--
-string(1) "?"
@@ -61,12 +61,10 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 	MY_MYSQL			*mysql = NULL;
 	MYSQLI_RESOURCE		*mysqli_resource = NULL;
 	zval				*object = getThis();
-	char				*hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL,
-						*ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL,
-						*ssl_cipher = NULL;
-	size_t				hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
-	zend_bool			persistent = FALSE, ssl = FALSE;
-	zend_long			port = 0, flags = 0;
+	char				*hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
+	size_t					hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
+	zend_bool			persistent = FALSE;
+	zend_long				port = 0, flags = 0;
 	zend_string			*hash_key = NULL;
 	zend_bool			new_connection = FALSE;
 	zend_resource		*le;
@@ -191,33 +189,6 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne

 								goto end;
 							} else {
-#ifdef MYSQLI_USE_MYSQLND
-								if (mysql->mysql->data->vio->data->ssl) {
-									/* copy over pre-existing ssl settings so we can reuse them when reconnecting */
-									ssl = TRUE;
-
-									ssl_key = my_estrdup(mysql->mysql->data->vio->data->options.ssl_key);
-									ssl_cert = my_estrdup(mysql->mysql->data->vio->data->options.ssl_cert);
-									ssl_ca = my_estrdup(mysql->mysql->data->vio->data->options.ssl_ca);
-									ssl_capath = my_estrdup(mysql->mysql->data->vio->data->options.ssl_capath);
-									ssl_cipher = my_estrdup(mysql->mysql->data->vio->data->options.ssl_cipher);
-								}
-#else
-								if (mysql->mysql->options.ssl_key
-										|| mysql->mysql->options.ssl_cert
-										|| mysql->mysql->options.ssl_ca
-										|| mysql->mysql->options.ssl_capath
-										|| mysql->mysql->options.ssl_cipher) {
-									/* copy over pre-existing ssl settings so we can reuse them when reconnecting */
-									ssl = TRUE;
-
-									ssl_key = my_estrdup(mysql->mysql->options.ssl_key);
-									ssl_cert = my_estrdup(mysql->mysql->options.ssl_cert);
-									ssl_ca = my_estrdup(mysql->mysql->options.ssl_ca);
-									ssl_capath = my_estrdup(mysql->mysql->options.ssl_capath);
-									ssl_cipher = my_estrdup(mysql->mysql->options.ssl_cipher);
-								}
-#endif
 								mysqli_close(mysql->mysql, MYSQLI_CLOSE_IMPLICIT);
 								mysql->mysql = NULL;
 							}
@@ -270,28 +241,8 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 	/* BC for prior to bug fix #53425 */
 	flags |= CLIENT_MULTI_RESULTS;

-	if (ssl) {
-		/* if we're here, this means previous conn was ssl, repopulate settings */
-		mysql_ssl_set(mysql->mysql, ssl_key, ssl_cert, ssl_ca, ssl_capath, ssl_cipher);
-
-		my_efree(ssl_key);
-		my_efree(ssl_cert);
-		my_efree(ssl_ca);
-		my_efree(ssl_capath);
-		my_efree(ssl_cipher);
-	}
 	if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, flags) == NULL)
 #else
-	if (ssl) {
-		/* if we're here, this means previous conn was ssl, repopulate settings */
-		mysql_ssl_set(mysql->mysql, ssl_key, ssl_cert, ssl_ca, ssl_capath, ssl_cipher);
-
-		my_efree(ssl_key);
-		my_efree(ssl_cert);
-		my_efree(ssl_ca);
-		my_efree(ssl_capath);
-		my_efree(ssl_cipher);
-	}
 	if (mysqlnd_connect(mysql->mysql, hostname, username, passwd, passwd_len, dbname, dbname_len,
 						port, socket, flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA) == NULL)
 #endif
@@ -7,10 +7,10 @@ mysqli autocommit/commit/rollback with innodb

 	require_once('connect.inc');
 	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+		die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -97,7 +97,7 @@ object(mysqli_stmt)#%d (%d) {
  ["sqlstate"]=>
  string(5) "00000"
  ["id"]=>
-  int(%d)
+  int(3)
 }
 bool(true)
 bool(false)
@@ -13,7 +13,7 @@ mysqli_autocommit()
 	}

 	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -14,7 +14,7 @@ mysqli->autocommit()
 	}

 	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -7,10 +7,10 @@ require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -1,78 +0,0 @@
--TEST--
-mysqli check the session_connect_attrs table for connection attributes
--SKIPIF--
-<?php
-require_once('skipif.inc');
-require_once('skipifconnectfailure.inc');
-
-if (!$IS_MYSQLND)
-	die("skip: test applies only to mysqlnd");
-
-if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die("skip Cannot connect to the server");
-
-/* skip test if the server version does not have session_connect_attrs table yet*/
-if (!$res = mysqli_query($link, "select count(*) as count from information_schema.tables where table_schema='performance_schema' and table_name='session_connect_attrs';"))
-    die("skip select from information_schema.tables for session_connect_attrs  query failed");
-
-$tmp = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
-if($tmp['count'] == "0") {
-    mysqli_close($link);
-    die("skip mysql does not support session_connect_attrs table yet");
-}
-
-/* skip test if performance_schema is OFF*/
-if (!$res = mysqli_query($link, "show variables like 'performance_schema';"))
-    die("skip show variables like 'performance_schema' failed");
-
-$tmp = mysqli_fetch_assoc($res);
-mysqli_free_result($res);
-if($tmp['Value'] == "OFF") {
-    mysqli_close($link);
-    die("skip performance_schema is OFF");
-}
-
-mysqli_close($link);
-?>
--FILE--
-<?php
-	require_once("connect.inc");
-
-	$tmp    = NULL;
-	$link   = NULL;
-    $res    = NULL;
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",$host, $user, $db, $port, $socket);
-
-    //in case $host is empty, do not test for _server_host field
-    if (isset($host) && trim($host) != '') {
-        if (!$res = mysqli_query($link, "select * from performance_schema.session_connect_attrs where ATTR_NAME='_server_host' and processlist_id = connection_id()")) {
-            printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        } else {
-            $tmp = mysqli_fetch_assoc($res);
-            if (!$tmp || !isset($tmp['ATTR_NAME'])) {
-                echo "[003] _server_host missing\n";
-            } elseif ($tmp['ATTR_VALUE'] !== $host) {
-                printf("[004] _server_host value mismatch\n") ;
-            }
-            mysqli_free_result($res);
-        }
-    }
-
-    if (!$res = mysqli_query($link, "select * from performance_schema.session_connect_attrs where ATTR_NAME='_client_name' and processlist_id = connection_id()")) {
-        printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    } else {
-        $tmp = mysqli_fetch_assoc($res);
-        if (!$tmp || !isset($tmp['ATTR_NAME'])) {
-            echo "[006] _client_name missing\n";
-        } elseif ($tmp['ATTR_VALUE'] !== "mysqlnd") {
-            printf("[007] _client_name value mismatch\n") ;
-        }
-        mysqli_free_result($res);
-    }
-
-    printf("done!");
-?>
--EXPECTF--
-done!
@@ -14,10 +14,10 @@ if (!function_exists('posix_getpid'))

 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -10,10 +10,10 @@ mysqli_rollback()

 	require_once('connect.inc');
 	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+		die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -8,10 +8,10 @@ require_once('skipifconnectfailure.inc');

 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -97,7 +97,7 @@ memory_limit=256M
 	require_once("clean_table.inc");
 ?>
 --EXPECTF--
-int(%d)
+int(1)
 executing
 bool(true)
 done!
@@ -425,9 +425,6 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn,
 		auth_packet->auth_data_len = auth_plugin_data_len;
 		auth_packet->auth_plugin_name = auth_protocol;

-        if (conn->server_capabilities & CLIENT_CONNECT_ATTRS) {
-			auth_packet->connect_attr = conn->options->connect_attr;
-        }

 		if (conn->m->get_server_version(conn) >= 50123) {
 			auth_packet->charset_no	= conn->charset->nr;
@@ -519,10 +519,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA *
 	}
 #endif

-    if (conn->options->connect_attr && zend_hash_num_elements(conn->options->connect_attr)) {
-		mysql_flags |= CLIENT_CONNECT_ATTRS;
-	}
-
 	DBG_RETURN(mysql_flags);
 }
 /* }}} */
@@ -669,7 +665,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,
 		password.s = "";
 		password.l = 0;
 	}
-	if (!database.s || !database.s[0]) {
+	if (!database.s) {
 		DBG_INF_FMT("no db given, using empty string");
 		database.s = "";
 		database.l = 0;
@@ -837,9 +833,6 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn_handle,

 	if (PASS == conn->m->local_tx_start(conn, this_func)) {
 		mysqlnd_options4(conn_handle, MYSQL_OPT_CONNECT_ATTR_ADD, "_client_name", "mysqlnd");
-        if (hostname.l > 0) {
-            mysqlnd_options4(conn_handle, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", hostname.s);
-        }
 		ret = conn->m->connect(conn, hostname, username, password, database, port, socket_or_pipe, mysql_flags);

 		conn->m->local_tx_end(conn, this_func, FAIL);
@@ -552,7 +552,7 @@ size_t php_mysqlnd_auth_write(void * _packet)
 			p+= packet->auth_data_len;
 		}

-		if (packet->db_len > 0) {
+		if (packet->db) {
 			/* CLIENT_CONNECT_WITH_DB should have been set */
 			size_t real_db_len = MIN(MYSQLND_MAX_ALLOWED_DB_LEN, packet->db_len);
 			memcpy(p, packet->db, real_db_len);
@@ -2752,10 +2752,7 @@ PHP_FUNCTION(odbc_close)
 		return;
 	}

-	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		RETURN_FALSE;
-	}
-
+	conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn);
 	if (Z_RES_P(pv_conn)->type == le_pconn) {
 		is_pconn = 1;
 	}
@@ -1,14 +0,0 @@
--TEST--
-Bug #78473 (odbc_close() closes arbitrary resources)
--SKIPIF--
-<?php
-if (!extension_loaded('odbc')) die('skip odbc extension not available');
-?>
--FILE--
-<?php
-odbc_close(STDIN);
-var_dump(STDIN);
-?>
--EXPECTF--
-Warning: odbc_close(): supplied resource is not a valid ODBC-Link resource in %s on line %d
-resource(%d) of type (stream)
@@ -302,8 +302,7 @@ static inline zend_bool can_elide_return_type_check(
 		return 0;
 	}

-	/* These types are not represented exactly */
-	if (ZEND_TYPE_CODE(info->type) == IS_CALLABLE || ZEND_TYPE_CODE(info->type) == IS_ITERABLE) {
+	if (ZEND_TYPE_CODE(info->type) == IS_CALLABLE) {
 		return 0;
 	}

@@ -277,7 +277,7 @@ static const func_info_t func_infos[] = {
 	F0("sleep",                        MAY_BE_FALSE | MAY_BE_LONG),
 	F0("usleep",                       MAY_BE_NULL | MAY_BE_FALSE),
 #if HAVE_NANOSLEEP
-	F0("time_nanosleep",               MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG),
+	F0("time_nanosleep",               MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 	F0("time_sleep_until",             MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 #endif
 #if HAVE_STRPTIME
@@ -404,7 +404,7 @@ static const func_info_t func_infos[] = {
 	F1("system",                       MAY_BE_FALSE | MAY_BE_STRING),
 	F1("escapeshellcmd",               MAY_BE_NULL | MAY_BE_STRING),
 	F1("escapeshellarg",               MAY_BE_NULL | MAY_BE_STRING),
-	F1("passthru",                     MAY_BE_NULL | MAY_BE_FALSE),
+	F1("passthru",                     MAY_BE_FALSE | MAY_BE_STRING),
 	F1("shell_exec",                   MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
 #ifdef PHP_CAN_SUPPORT_PROC_OPEN
 	F1("proc_open",                    MAY_BE_FALSE | MAY_BE_RESOURCE),
@@ -685,7 +685,7 @@ static const func_info_t func_infos[] = {
 	F1("stream_get_transports",        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
 	F1("stream_resolve_include_path",  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
 	F0("stream_is_local",              MAY_BE_FALSE | MAY_BE_TRUE),
-	F1("get_headers",                  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
+	F1("get_headers",                  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
 #if HAVE_SYS_TIME_H || defined(PHP_WIN32)
 	F0("stream_set_timeout",           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 	F0("socket_set_timeout",           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
@@ -1192,7 +1192,7 @@ static const func_info_t func_infos[] = {
 	F1("hash_hmac_file",                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
 	F1("hash_init",                             MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
 	F0("hash_update",                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-	F0("hash_update_stream",                    MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
+	F0("hash_update_stream",                    MAY_BE_NULL | MAY_BE_LONG),
 	F0("hash_update_file",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 	F1("hash_final",                            MAY_BE_NULL | MAY_BE_STRING),
 	F1("hash_copy",                             MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
@@ -1215,7 +1215,7 @@ uint32_t zend_get_func_info(const zend_call_info *call_info, const zend_ssa *ssa
 	if (call_info->callee_func->type == ZEND_INTERNAL_FUNCTION) {
 		func_info_t *info;

-		if (!call_info->callee_func->common.scope && (info = zend_hash_find_ptr(&func_info, Z_STR_P(CRT_CONSTANT_EX(call_info->caller_op_array, call_info->caller_init_opline->op2, ssa->rt_constants)))) != NULL) {
+		if ((info = zend_hash_find_ptr(&func_info, Z_STR_P(CRT_CONSTANT_EX(call_info->caller_op_array, call_info->caller_init_opline->op2, ssa->rt_constants)))) != NULL) {
 			if (UNEXPECTED(zend_optimizer_is_disabled_func(info->name, info->name_len))) {
 				ret = MAY_BE_NULL;
 			} else if (info->info_func) {
@@ -1,34 +0,0 @@
--TEST--
-$v = !$v/(bool)$v checks for undefined variables
--INI--
-opcache.enable=1
-opcache.enable_cli=1
-opcache.file_cache_only=0
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
-<?php
-function undef_negation() {
-    echo "In undef_negation\n";
-    $v = !$v;
-    var_export($v);
-    echo "\n";
-}
-function undef_bool_cast() {
-    echo "In undef_bool_cast\n";
-    $v = (bool)$v;
-    var_export($v);
-    echo "\n";
-}
-undef_negation();
-undef_bool_cast();
-?>
--EXPECTF--
-In undef_negation
-
-Notice: Undefined variable: v in %s on line 4
-true
-In undef_bool_cast
-
-Notice: Undefined variable: v in %s on line 10
-false
@@ -1,14 +0,0 @@
--TEST--
-Internal static methods should not be confused with global functions
--SKIPIF--
-<?php
-if (!extension_loaded('zend-test')) die('skip requires zend-test');
-?>
--FILE--
-<?php
-
-var_dump(is_bool(_ZendTestClass::is_object()));
-
-?>
--EXPECT--
-bool(false)
@@ -1,17 +0,0 @@
--TEST--
-Don't optimize object -> iterable
--FILE--
-<?php
-
-function test(object $arg): iterable {
-    return $arg;
-}
-test(new stdClass);
-
-?>
--EXPECTF--
-Fatal error: Uncaught TypeError: Return value of test() must be iterable, object returned in %s:%d
-Stack trace:
-#0 %s(%d): test(Object(stdClass))
-#1 {main}
-  thrown in %s on line %d
Author	SHA1	Message	Date
Sara Golemon	3ff099be9a	Update versions for PHP 7.2.22	2019-08-28 02:37:29 +00:00
Sara Golemon	95217c35eb	Prep for 7.2.22 GA	2019-08-27 22:34:24 -04:00
Christoph M. Becker	8debe97557	Fix #75457 : heap-use-after-free in php7.0.25 Backport <https://vcs.pcre.org/pcre?view=revision&revision=1638>.	2019-08-27 22:26:21 -04:00
Stanislav Malyshev	4d4f71aa84	Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe() Backport from https://github.com/kkos/oniguruma/commit/0f7f61ed1b7b697e283e37bd2d731d0bd57adb55	2019-08-27 22:25:35 -04:00
Sara Golemon	39b0c30a0d	Update CREDITS for PHP 7.2.22RC1	2019-08-13 22:57:08 +00:00
Sara Golemon	6a0e04c623	Update NEWS for PHP 7.2.22RC1	2019-08-13 22:57:08 +00:00