set versions

set versions for 7.1.6RC1
2026-11-09 18:20:50 +00:00 · 2017-06-07 09:05:10 +01:00 · 2017-05-23 22:01:56 +01:00
1356 changed files with 15733 additions and 25793 deletions
@@ -18,12 +18,13 @@ clone_depth: 64

 cache:
        - c:\build-cache
+        - c:\build-cache\sdk -> .appveyor.yml

 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.1.1
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.0.4
        # ext and env setup for tests
        #MYSQL_TEST_PASSWD: Password12!
        #MYSQL_TEST_USER: root
@@ -1,35 +1,16 @@
-# http://editorconfig.org/
+; http://editorconfig.org/

 root = true

-[*.{c,h,awk,w32,bat,mk,frag}]
-charset                  = utf-8
-end_of_line              = lf
+[*.{c,h}]
+charset                  = UTF-8
+end_of_line              = LF
 indent_size              = 4
 indent_style             = tab
+insert_final_newline     = true
 tab_width                = 4
 trim_trailing_whitespace = true
-insert_final_newline     = true

-[*.{php,phpt}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.{yml,m4,sh}]
-charset                  = utf-8
-end_of_line              = lf
+[*.yml]
 indent_size              = 2
 indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.md]
-charset                  = utf-8
-end_of_line              = lf
-indent_style             = space
-trim_trailing_whitespace = false
-insert_final_newline     = true
@@ -171,7 +171,7 @@ define ____printzv_contents
 		printf "UNDEF"
 	end
 	if $type == 1
-		printf "NULL"
+        printf "NULL"
 	end
 	if $type == 2
 		printf "bool: false"
@@ -179,15 +179,15 @@ define ____printzv_contents
 	if $type == 3
 		printf "bool: true"
 	end
-	if $type == 4
+    if $type == 4
 		printf "long: %ld", $zvalue->value.lval
-	end
-	if $type == 5
-		printf "double: %f", $zvalue->value.dval
-	end
-	if $type == 6
-		printf "string: %s", $zvalue->value.str->val
-	end
+    end
+    if $type == 5
+        printf "double: %f", $zvalue->value.dval
+    end
+    if $type == 6
+       printf "string: %s", $zvalue->value.str->val
+    end
 	if $type == 7 
 		printf "array: "
 		if ! $arg1
@@ -245,31 +245,25 @@ define ____printzv_contents
 		printf "const: %s", $zvalue->value.str->val
 	end
 	if $type == 12
-		printf "CONSTANT_AST"
+		printf "const_ast"
 	end
 	if $type == 13
-		printf "_BOOL"
+		printf "_IS_BOOL"
 	end
 	if $type == 14
-		printf "CALLABLE"
+		printf "IS_CALLABLE"
 	end
 	if $type == 15
 		printf "indirect: "
 		____printzv $zvalue->value.zv $arg1
 	end
+	if $type == 16
+		printf "string_offset"
+	end
 	if $type == 17
 		printf "pointer: %p", $zvalue->value.ptr
 	end
-	if $type == 18
-		printf "ITERABLE"
-	end
-	if $type == 19
-		printf "VOID"
-	end
-	if $type == 20
-		printf "_ERROR"
-	end
-	if $type == 16 || $type > 20
+	if $type > 17
 		printf "unknown type %d", $type
 	end
 	printf "\n"
@@ -289,18 +283,38 @@ define ____printzv
 	end
 end

+define ____print_const_table
+	set $ht = $arg0
+	set $p = $ht->pListHead
+
+	while $p != 0
+		set $const = (zend_constant *) $p->pData
+
+		set $i = $ind
+		while $i > 0
+			printf "  "
+			set $i = $i - 1
+		end
+
+		if $p->nKeyLength > 0
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
+		else
+			printf "%d => ", $p->h
+		end
+
+		____printzv_contents &$const->value 0
+		set $p = $p->pListNext
+	end
+end
+
 define print_const_table
 	set $ind = 1
 	printf "[%p] {\n", $arg0
-	____print_ht $arg0 4
+	____print_const_table $arg0
 	printf "}\n"
 end

-document print_const_table
-	Dumps elements of Constants HashTable
-	Example: print_const_table executor_globals.zend_constants
-end
-
 define ____print_ht
 	set $ht = (HashTable*)$arg0
 	set $n = $ind
@@ -347,10 +361,6 @@ define ____print_ht
 				set $func = (zend_function*)$p->val.value.ptr
 				printf "\"%s\"\n", $func->common.function_name->val
 			end
-			if $arg1 == 4
-				set $const = (zend_constant *)$p->val.value.ptr
-				____printzv $const 1
-			end
 		end
 		set $i = $i + 1
 	end
@@ -462,12 +472,9 @@ end

 define print_pi
 	set $pi = (zend_property_info *)$arg0
-	set $initial_offset = ((uint32_t)(zend_uintptr_t)(&((zend_object*)0)->properties_table[(0)]))
-	set $ptr_to_val = (zval*)((char*)$pi->ce->default_properties_table + $pi->offset - $initial_offset)
 	printf "[%p] {\n", $pi
-	printf "    offset = %p\n", $pi->offset
 	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
-	printf "    flags = 0x%x (", $pi->flags
+	printf "    flags = %d (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
 	else
@@ -478,11 +485,7 @@ define print_pi
 				printf "ZEND_ACC_PRIVATE"
 			else
 				if $pi->flags & 0x800
-					printf "ZEND_ACC_EARLY_BINDING"
-				else
-					if $pi->flags & 0x20000
-						printf "ZEND_ACC_SHADOW"
-					end
+					printf "ZEND_ACC_CHANGED"
 				end
 			end
 		end
@@ -490,8 +493,6 @@ define print_pi
 	printf ")\n"
 	printf "    name  = "
 	print_zstr $pi->name
-	printf "    default value: "
-	printzv $ptr_to_val
 	printf "}\n"
 end

@@ -15,8 +15,11 @@ ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
 ext/filter/filter.c             ident
+ext/zip/php_zip.c               ident
 README.input_filter             ident
 run-tests.php                   ident
+sapi/nsapi/nsapi.c              ident
+sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 ext/exif/exif.c                 ident
@@ -29,6 +32,7 @@ UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf
+/ext/ereg/tests/eregi_basic_002.phpt	-crlf
 /ext/iconv/tests/iconv004.phpt	-crlf
 /ext/iconv/tests/iconv_basic.phpt	-crlf
 /ext/iconv/tests/iconv_strpos.phpt	-crlf
@@ -262,7 +262,9 @@ pear/phpize
 pear/run-tests
 pear/php-config
 pear/scripts
+sapi/apache/libphp7.module
 sapi/apache2handler/libphp7.module
+sapi/apache_hooks/libphp7.module
 sapi/cgi/php-cgi
 sapi/cgi/php-cgi.1
 sapi/cli/php.1
@@ -1,4 +1,3 @@
-dist: trusty
 language: c
 sudo: false
 addons:
@@ -58,4 +57,4 @@ before_script:

 # Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
@@ -47,7 +47,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           fpm
-PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
+PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>, Jerome Loyet <fat@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3.3
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2018 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2017 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -5,7 +5,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)

-all: $(all_targets)
+all: $(all_targets) 
 	@echo
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
@@ -112,13 +112,13 @@ test: all
 clean:
 	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*

 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
 	rm -f php7.spec main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
 	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
@@ -135,7 +135,7 @@ prof-gen:

 prof-clean:
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*

@@ -1,566 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-29 Mar 2018, PHP 7.1.16
-
- Core:
-  . Fixed bug #76025 (Segfault while throwing exception in error_handler).
-    (Dmitry, Laruence)
-  . Fixed bug #76044 ('date: illegal option -- -' in ./configure on FreeBSD).
-    (Anatol)
-
- FPM:
-  . Fixed bug #75605 (Dumpable FPM child processes allow bypassing opcache
-    access controls). (Jakub Zelenka)
-
- GD:
-  . Fixed bug #73957 (signed integer conversion in imagescale()). (cmb)
-
- ODBC:
-  . Fixed bug #76088 (ODBC functions are not available by default on Windows).
-    (cmb)
-
- Opcache:
-  . Fixed bug #76074 (opcache corrupts variable in for-loop). (Bob)
-
- Phar:
-  . Fixed bug #76085 (Segmentation fault in buildFromIterator when directory
-    name contains a \n). (Laruence)
-
- Standard:
-  . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
-  . Fixed bug #76068 (parse_ini_string fails to parse "[foo]\nbar=1|>baz" with
-    segfault). (Anatol)
-
-01 Mar 2018, PHP 7.1.15
-
- Apache2Handler:
-  . Fixed bug #75882 (a simple way for segfaults in threadsafe php just with
-    configuration). (Anatol)
-
- Date:
-  . Fixed bug #75857 (Timezone gets truncated when formatted). (carusogabriel)
-  . Fixed bug #75928 (Argument 2 for `DateTimeZone::listIdentifiers()` should
-    accept `null`). (Pedro Lacerda)
-  . Fixed bug #68406 (calling var_dump on a DateTimeZone object modifies it).
-    (jhdxr)
-
- FTP:
-  . Fixed ftp_pasv arginfo. (carusogabriel)
-
-GD:
-  . Fixed imagesetinterpolation arginfo. (Gabriel Caruso)
-
- iconv:
-  . Fixed bug #75867 (Freeing uninitialized pointer). (Philip Prindeville)
-
- LDAP:
-  . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
-
- libxml2:
-  . Fixed bug #75871 (use pkg-config where available). (pmmaga)
-
- mysqlnd
-  . Fixed negotiation of MySQL authenticaton plugin. (Johannes)
-  . Fixed a memleak with SSL connections. (Johannes)
-
- ODBC:
-  . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)
-
- Opcache:
-  . Fixed bug #75969 (Assertion failure in live range DCE due to block pass
-    misoptimization). (Nikita)
-
- OpenSSL:
-  . Fixed openssl_* arginfos. (carusogabriel)
-
- PCNTL:
-  . Fixed bug #75873 (pcntl_wexitstatus returns incorrect on Big_Endian platform
-    (s390x)). (Sam Ding)
-
- PGSQL:
-  . Fixed #75838 (Memory leak in pg_escape_bytea()). (ard_1 at mail dot ru)
-
- Phar:
-  . Fixed bug #65414 (deal with leading slash when adding files correctly).
-    (bishopb)
-
- SPL:
-  . Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr)
-
- Standard:
-  . Fixed bug #75961 (Strange references behavior). (Laruence)
-  . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike, 
-    Philip Sharp)
-  . Fixed some arginfos. (carusogabriel)
-  . Fixed bug #75981 (stack-buffer-overflow while parsing HTTP response). (Stas)
-
-01 Feb 2018, PHP 7.1.14
-
- Core:
-  . Fixed bug #75679 (Path 260 character problem). (Anatol)
-  . Fixed bug #75786 (segfault when using spread operator on generator passed
-    by reference). (Nikita)
-  . Fixed bug #75799 (arg of get_defined_functions is optional). (carusogabriel)
-  . Fixed bug #75396 (Exit inside generator finally results in fatal error).
-    (Nikita)
-  . Fixed bug #75079 (self keyword leads to incorrectly generated TypeError when
-    in closure in trait). (Nikita)
-
- FCGI:
-  . Fixed bug #75794 (getenv() crashes on Windows 7.2.1 when second parameter is
-    false). (Anatol)
-
- IMAP:
-  . Fixed bug #75774 (imap_append HeapCorruction). (Anatol)
-
- Mbstring:
-  . Fixed bug #62545 (wrong unicode mapping in some charsets). (cmb)
-
- Opcache:
-  . Fixed bug #75720 (File cache not populated after SHM runs full). (Dmitry)
-  . Fixed bug #75579 (Interned strings buffer overflow may cause crash).
-    (Dmitry)
-
- PGSQL:
-  . Fixed bug #75671 (pg_version() crashes when called on a connection to
-    cockroach). (magicaltux at gmail dot com)
-
- Readline:
-  . Fixed bug #75775 (readline_read_history segfaults with empty file).
-    (Anatol)
-
- SAPI:
-  . Fixed bug #75735 ([embed SAPI] Segmentation fault in
-    sapi_register_post_entry). (Laruence)
-
- SOAP:
-  . Fixed bug #70469 (SoapClient generates E_ERROR even if exceptions=1 is
-    used). (Anton Artamonov)
-  . Fixed bug #75502 (Segmentation fault in zend_string_release). (Nikita)
-
- SPL:
-  . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by
-    reference). (Nikita)
-  . Fixed bug #75242 (RecursiveArrayIterator doesn't have constants from parent
-    class). (Nikita)
-  . Fixed bug #73209 (RecursiveArrayIterator does not iterate object
-    properties). (Nikita)
-
- Standard:
-   . Fixed bug #75781 (substr_count incorrect result). (Laruence)
-
-04 Jan 2018, PHP 7.1.13
-
- Core:
-  . Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26). (Laruence)
-  . Fixed bug #75384 (PHP seems incompatible with OneDrive files on demand).
-    (Anatol)
-  . Fixed bug #74862 (Unable to clone instance when private __clone defined).
-    (Daniel Ciochiu)
-  . Fixed bug #75074 (php-process crash when is_file() is used with strings
-    longer 260 chars). (Anatol)
-  . Fixed bug #69727 (Remove timestamps from build to make it reproducible).
-    (jelle van der Waa)
-
- CLI Server:
-  . Fixed bug #60471 (Random "Invalid request (unexpected EOF)" using a router
-    script). (SammyK)
-  . Fixed bug #73830 (Directory does not exist). (Anatol)
-
- FPM:
-  . Fixed bug #64938 (libxml_disable_entity_loader setting is shared between
-    requests). (Remi)
-
- GD:
-  . Fixed bug #75571 (Potential infinite loop in gdImageCreateFromGifCtx).
-    (Christoph)
-
- Opcache:
-  . Fixed bug #75608 ("Narrowing occurred during type inference" error).
-    (Laruence, Dmitry)
-  . Fixed bug #75570 ("Narrowing occurred during type inference" error).
-    (Dmitry)
-  . Fixed bug #75579 (Interned strings buffer overflow may cause crash).
-    (Dmitry)
-
- PCRE:
-  . Fixed bug #74183 (preg_last_error not returning error code after error).
-    (Andrew Nester)
-
- Phar:
-  . Fixed bug #74782 (remove file name from output to avoid XSS). (stas)
-
- Standard:
-  . Fixed bug #75511 (fread not free unused buffer). (Laruence)
-  . Fixed bug #75514 (mt_rand returns value outside [$min,$max]+ on 32-bit)
-    (Remi)
-  . Fixed bug #75535 (Inappropriately parsing HTTP response leads to PHP
-    segment fault). (Nikita)
-  . Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator 
-    that getrandom() is missing). (sarciszewski)
-  . Fixed bug #73124 (php_ini_scanned_files() not reporting correctly).
-    (John Stevenson)
-  . Fixed bug #75574 (putenv does not work properly if parameter contains
-    non-ASCII unicode character). (Anatol)
-
- Zip:
-  . Fixed bug #75540 (Segfault with libzip 1.3.1). (Remi)
-
-23 Nov 2017, PHP 7.1.12
-
- Core:
-  . Fixed bug #75420 (Crash when modifing property name in __isset for
-    BP_VAR_IS). (Laruence)
-  . Fixed bug #75368 (mmap/munmap trashing on unlucky allocations). (Nikita,
-    Dmitry)
-
- CLI:
-  . Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown
-    function). (Laruence)
-
- Enchant:
-  . Fixed bug #53070 (enchant_broker_get_path crashes if no path is set). (jelle
-    van der Waa, cmb)
-  . Fixed bug #75365 (Enchant still reports version 1.1.0). (cmb)
-
- Exif:
-  . Fixed bug #75301 (Exif extension has built in revision version). (Peter
-    Kokot)
-
- GD:
-  . Fixed bug #65148 (imagerotate may alter image dimensions). (cmb)
-  . Fixed bug #75437 (Wrong reflection on imagewebp). (Fabien Villepinte)
-
- intl:
-  . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead 
-    of destination). (andrewnester)
-
- interbase:
-  . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa)
-
- Mysqli:
-  . Fixed bug #75434 (Wrong reflection for mysqli_fetch_all function). (Fabien
-    Villepinte)
-
- OCI8:
-  . Fixed valgrind issue. (Tianfang Yang)
-
- OpenSSL:
-  . Fixed bug #75363 (openssl_x509_parse leaks memory). (Bob, Jakub Zelenka)
-  . Fixed bug #75307 (Wrong reflection for openssl_open function). (villfa)
-
- Opcache:
-  . Fixed bug #75373 (Warning Internal error: wrong size calculation). (Laruence, Dmitry)
-
- PGSQL:
-  . Fixed bug #75419 (Default link incorrectly cleared/linked by pg_close()). (Sara)
-
- SOAP:
-  . Fixed bug #75464 (Wrong reflection on SoapClient::__setSoapHeaders). (villfa)
-
- Zlib:
-  . Fixed bug #75299 (Wrong reflection on inflate_init and inflate_add). (Fabien
-    Villepinte)
-
-26 Oct 2017, PHP 7.1.11
-
- Core:
-  . Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
-    (Laruence)
-  . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea)
-  . Fixed bug #75252 (Incorrect token formatting on two parse errors in one
-    request). (Nikita)
-  . Fixed bug #75220 (Segfault when calling is_callable on parent). 
-    (andrewnester)
-  . Fixed bug #75290 (debug info of Closures of internal functions contain
-    garbage argument names). (Andrea)
-
- Apache2Handler:
-  . Fixed bug #75311 (error: 'zend_hash_key' has no member named 'arKey' in
-    apache2handler). (mcarbonneaux)
-
- Date:
-  . Fixed bug #75055 (Out-Of-Bounds Read in timelib_meridian()). (Derick)
-
- Hash:
-  . Fixed bug #75303 (sha3 hangs on bigendian). (Remi)
-
- Intl:
-  . Fixed bug #75318 (The parameter of UConverter::getAliases() is not
-    optional). (cmb)
-
- litespeed:
-  . Fixed bug #75248 (Binary directory doesn't get created when building 
-    only litespeed SAPI). (petk)
-  . Fixed bug #75251 (Missing program prefix and suffix). (petk)
-
- mcrypt:
-  . Fixed bug #72535 (arcfour encryption stream filter crashes php). (Leigh)
-
- MySQLi:
-  . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol)
-
- OCI8:
-  . Fixed incorrect reference counting. (Dmitry, Tianfang Yang)
-
- Opcache
-  . Fixed bug #75255 (Request hangs and not finish). (Dmitry)
-
- PCRE:
-  . Fixed bug #75207 (applied upstream patch for CVE-2016-1283). (Anatol)
-
- PDO_mysql:
-  . Fixed bug #75177 (Type 'bit' is fetched as unexpected string). (Anatol)
-
- SPL:
-  . Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags).
-    (J. Jeising, cmb)
-
-28 Sep 2017, PHP 7.1.10
-
- Core:
-  . Fixed bug #75042 (run-tests.php issues with EXTENSION block). (John Boehr)
-
- BCMath:
-  . Fixed bug #44995 (bcpowmod() fails if scale != 0). (cmb)
-  . Fixed bug #46781 (BC math handles minus zero incorrectly). (cmb)
-  . Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1). (okano1220, cmb)
-  . Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus). (cmb)
-
- CLI server:
-  . Fixed bug #70470 (Built-in server truncates headers spanning over TCP
-    packets). (bouk)
-
- CURL:
-  . Fixed bug #75093 (OpenSSL support not detected). (Remi)
-
- GD:
-  . Fixed bug #75124 (gdImageGrayScale() may produce colors). (cmb)
-  . Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?). (cmb)
-
- Gettext:
-  . Fixed bug #73730 (textdomain(null) throws in strict mode). (cmb)
-
- Intl:
-  . Fixed bug #75090 (IntlGregorianCalendar doesn't have constants from parent
-    class). (tpunt)
-  . Fixed bug #75193 (segfault in collator_convert_object_to_string). (Remi)
-
- PDO_OCI:
-  . Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized
-    before PHP-FPM sets it up). (Ingmar Runge)
-
- SPL:
-  . Fixed bug #75155 (AppendIterator::append() is broken when appending another
-    AppendIterator). (Nikita)
-  . Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach loop).
-    (jhdxr)
-
- Standard:
-  . Fixed bug #75152 (signed integer overflow in parse_iv). (Laruence)
-  . Fixed bug #75097 (gethostname fails if your host name is 64 chars long). (Andrea)
-
-31 Aug 2017, PHP 7.1.9
-
- Core:
-  . Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
-  . Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob)
-  . Fixed bug #74725 (html_errors=1 breaks unhandled exceptions). (Andrea)
-  . Fixed bug #75063 (Main CWD initialized with wrong codepage). (Anatol)
-  . Fixed bug #75349 (NAN comparison). (Sara)
-
- cURL:
-  . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).
-    (cebe)
-
- Date:
-  . Fixed bug #75002 (Null Pointer Dereference in timelib_time_clone). (Derick)
-
- Intl:
-  . Fixed bug #74993 (Wrong reflection on some locale_* functions). (Sara)
-
- Mbstring:
-  . Fixed bug #71606 (Segmentation fault mb_strcut with HTML-ENTITIES encoding).
-    (cmb)
-  . Fixed bug #62934 (mb_convert_kana() does not convert iteration marks).
-    (Nikita)
-  . Fixed bug #75001 (Wrong reflection on mb_eregi_replace). (Fabien
-    Villepinte)
-
- MySQLi:
-  . Fixed bug #74968 (PHP crashes when calling mysqli_result::fetch_object with
-    an abstract class). (Anatol)
-
- OCI8:
-  . Expose oci_unregister_taf_callback() (Tianfang Yang)
-
- Opcache:
-  . Fixed bug #74980 (Narrowing occurred during type inference). (Laruence)
-
- phar:
-  . Fixed bug #74991 (include_path has a 4096 char limit in some cases).
-    (bwbroersma)
-
- Reflection:
-  . Fixed bug #74949 (null pointer dereference in _function_string). (Laruence)
-
- Session:
-  . Fixed bug #74892 (Url Rewriting (trans_sid) not working on urls that start
-    with "#"). (Andrew Nester)
-  . Fixed bug #74833 (SID constant created with wrong module number). (Anatol)
-
- SimpleXML:
-  . Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces).
-    (Laruence)
-
- SPL:
-  . Fixed bug #75049 (spl_autoload_unregister can't handle
-    spl_autoload_functions results). (Laruence)
-  . Fixed bug #74669 (Unserialize ArrayIterator broken). (Andrew Nester)
-  . Fixed bug #74977 (Appending AppendIterator leads to segfault). 
-    (Andrew Nester)
-  . Fixed bug #75015 (Crash in recursive iterator destructors). (Julien)
-
- Standard:
-  . Fixed bug #75075 (unpack with X* causes infinity loop). (Laruence)
-  . Fixed bug #74103 (heap-use-after-free when unserializing invalid array
-    size). (Nikita)
-  . Fixed bug #75054 (A Denial of Service Vulnerability was found when
-    performing deserialization). (Nikita)
-
- WDDX:
-  . Fixed bug #73793 (WDDX uses wrong decimal seperator). (cmb)
-
- XMLRPC:
-  . Fixed bug #74975 (Incorrect xmlrpc serialization for classes with declared
-    properties). (blar)
-
-03 Aug 2017, PHP 7.1.8
-
- Core:
-  . Fixed bug #74832 (Loading PHP extension with already registered function 
-    name leads to a crash). (jpauli)
-  . Fixed bug #74780 (parse_url() broken when query string contains colon). 
-    (jhdxr)
-  . Fixed bug #74761 (Unary operator expected error on some systems). (petk)
-  . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic)
-  . Fixed bug #74923 (Crash when crawling through network share). (Anatol)
-  . Fixed bug #74913 (fixed incorrect poll.h include). (petk)
-  . Fixed bug #74906 (fixed incorrect errno.h include). (petk)
-
- Date:
-  . Fixed bug #74852 (property_exists returns true on unknown DateInterval 
-    property). (jhdxr)
-
- OCI8:
-  . Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge)
-
- Opcache:
-  . Fixed bug #74623 (Infinite loop in type inference when using HTMLPurifier).
-    (nikic)
-
- OpenSSL:
- . Fixed bug #74798 (pkcs7_en/decrypt does not work if \x0a is used in content).
-   (Anatol)
- . Added OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key padding and fix bug
-   #71917 (openssl_open() returns junk on envelope < 16 bytes) and bug #72362
-   (OpenSSL Blowfish encryption is incorrect for short keys). (Jakub Zelenka)
-
- PDO:
-  . Fixed bug #69356 (PDOStatement::debugDumpParams() truncates query). (Adam
-    Baratz)
-
- SPL:
-  . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)
-
- SQLite3:
-  . Fixed bug #74883 (SQLite3::__construct() produces "out of memory" exception
-    with invalid flags). (Anatol)
-
- Wddx:
-  . Fixed bug #73173 (huge memleak when wddx_unserialize).
-    (tloi at fortinet dot com)
-
- zlib:
-  . Fixed bug #73944 (dictionary option of inflate_init() does not work).
-    (wapmorgan)
-
-06 Jul 2017, PHP 7.1.7
-
- Core:
-  . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly
-    parsed). (Manuel Mausz)
-  . Fixed bug #74658 (Undefined constants in array properties result in broken
-    properties). (Laruence)
-  . Fixed misparsing of abstract unix domain socket names. (Sara)
-  . Fixed bug #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability).
-    (Stas)
-  . Fixed bug #74101, bug #74614 (Unserialize Heap Use-After-Free (READ: 1) in
-    zval_get_type). (Nikita)
-  . Fixed bug #74111 (Heap buffer overread (READ: 1) finish_nested_data from
-    unserialize). (Nikita)
-  . Fixed bug #74819 (wddx_deserialize() heap out-of-bound read via
-    php_parse_date()). (Derick)
-
- Date:
-  . Fixed bug #74639 (implement clone for DatePeriod and DateInterval).
-    (andrewnester)
-
- DOM:
-  . Fixed bug #69373 (References to deleted XPath query results). (ttoohey)
-
- GD:
-  . Fixed bug #74435 (Buffer over-read into uninitialized memory). (cmb)
-
- Intl:
-  . Fixed bug #73473 (Stack Buffer Overflow in msgfmt_parse_message). (libnex)
-  . Fixed bug #74705 (Wrong reflection on Collator::getSortKey and
-    collator_get_sort_key). (Tyson Andre, Remi)
-
- Mbstring:
-  . Add oniguruma upstream fix (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227,
-    CVE-2017-9228, CVE-2017-9229) (Remi, Mamoru TASAKA)
-
- OCI8:
-  . Add TAF callback (PR #2459). (KoenigsKind)
-
- Opcache:
-  . Fixed bug #74663 (Segfault with opcache.memory_protect and
-    validate_timestamp). (Laruence)
-  . Revert opcache.enable_cli to default disabled. (Nikita)
-
- OpenSSL:
-  . Fixed bug #74720 (pkcs7_en/decrypt does not work if \x1a is used in
-    content). (Anatol)
-  . Fixed bug #74651 (negative-size-param (-1) in memcpy in zif_openssl_seal()).
-    (Stas)
-
- PDO_OCI:
-  . Support Instant Client 12.2 in --with-pdo-oci configure option.
-    (Tianfang Yang)
-
- Reflection:
-  . Fixed bug #74673 (Segfault when cast Reflection object to string with
-    undefined constant). (Laruence)
-
- SPL:
-  . Fixed bug #74478 (null coalescing operator failing with SplFixedArray).
-    (jhdxr)
-
- FTP:
-  . Fixed bug #74598 (ftp:// wrapper ignores context arg). (Sara)
-
- PHAR:
-  . Fixed bug #74386 (Phar::__construct reflection incorrect). (villfa)
-
- SOAP
-  . Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY).
-    (Dmitry)
-
- Streams:
-  . Fixed bug #74556 (stream_socket_get_name() returns '\0'). (Sara)
-
-8 Jun 2017, PHP 7.1.6
+7 Jun 2017, PHP 7.1.6

 - Core:
  . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).
@@ -799,8 +239,6 @@ PHP                                                                        NEWS
    anonymous classes). (Adam Saponara)
  . Fixed bug #74105 (PHP on Linux should use /dev/urandom when getrandom is
    not available). (Benjamin Robin)
-  . Fixed bug #74708 (Invalid Reflection signatures for random_bytes and
-    random_int). (Tyson Andre, Remi)

 - Streams:
  . Fixed bug #73496 (Invalid memory access in zend_inline_hash_func).
@@ -93,12 +93,7 @@ static FILE *tsrm_error_file;
 	}
 #endif

-#if defined(GNUPTH)
-static pth_key_t tls_key;
-# define tsrm_tls_set(what)		pth_key_setdata(tls_key, (void*)(what))
-# define tsrm_tls_get()			pth_key_getdata(tls_key)
-
-#elif defined(PTHREADS)
+#if defined(PTHREADS)
 /* Thread local storage */
 static pthread_key_t tls_key;
 # define tsrm_tls_set(what)		pthread_setspecific(tls_key, (void*)(what))
@@ -130,7 +125,6 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 {
 #if defined(GNUPTH)
 	pth_init();
-	pth_key_create(&tls_key, 0);
 #elif defined(PTHREADS)
 	pthread_key_create( &tls_key, 0 );
 #elif defined(TSRM_ST)
@@ -174,10 +174,8 @@ TSRM_API void *tsrm_get_ls_cache(void);
 #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
 #if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
-#define TSRMLS_CACHE_RESET()
 #else
 #define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
-#define TSRMLS_CACHE_RESET()  TSRMLS_CACHE = NULL
 #endif
 #define TSRMLS_CACHE _tsrm_ls_cache

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2017 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2017 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2017 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2017 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@ object(ReflectionClass)#4 (1) {
 }
 Parameter #0 [ <required> stdClass $x ]
 stdClass
-Method [ <internal> public method __invoke ] {
+Method [ <internal, prototype Closure> public method __invoke ] {

  - Parameters [1] {
    Parameter #0 [ <required> stdClass $x ]
@@ -53,43 +53,27 @@ string(3) "1st"
 string(3) "2nd"
 NULL
 string(3) "4th"
-array(4) {
+array(3) {
  [0]=>
  string(3) "1st"
  [1]=>
  &string(3) "2nd"
-  [2]=>
-  NULL
  [3]=>
  string(3) "4th"
 }
-array(4) {
-  [0]=>
-  NULL
+array(2) {
  [1]=>
  string(3) "2nd"
-  [2]=>
-  NULL
  [3]=>
  string(3) "4th"
 }
-array(4) {
-  [0]=>
-  NULL
+array(2) {
  [1]=>
  &string(3) "2nd"
-  [2]=>
-  NULL
  [3]=>
  string(3) "4th"
 }
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  NULL
+array(1) {
  [3]=>
  string(3) "4th"
 }
@@ -1,15 +0,0 @@
--TEST--
-Bug #73900: Use After Free in unserialize() SplFixedArray
--FILE--
-<?php
-
-$a = new stdClass;
-$b = new SplFixedArray(1);
-$b[0] = $a;
-$c = &$b[0];
-var_dump($c);
-
-?>
--EXPECT--
-object(stdClass)#1 (0) {
-}
@@ -1 +0,0 @@
-0=0&~2000000000
@@ -1,15 +0,0 @@
--TEST--
-Bug #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability)
--SKIPIF--
-<?php
-if (PHP_INT_MAX !== 2147483647)
-        die('skip for 32-bit only');
--FILE--
-<?php
-var_dump(parse_ini_file(__DIR__ . "/bug74603.ini", true, INI_SCANNER_NORMAL));
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  string(1) "0"
-}
@@ -1,26 +0,0 @@
--TEST--
-Bug #74657 (Undefined constants in array properties result in broken properties)
--FILE--
-<?php
-
-interface I {
-}
-
-class C {
-	const FOO = I::FOO;
-
-	public $options = [self::FOO => "bar"];
-}
-
-try {
-	var_dump((new C)->options);
-} catch (Throwable $e) {}
-
-var_dump((new C)->options);
-?>
--EXPECTF--
-Fatal error: Uncaught Error: Undefined class constant 'I::FOO' in %sbug74657.php:%d
-Stack trace:
-#0 {main}
-  thrown in %sbug74657.php on line %d
-
@@ -1,21 +0,0 @@
--TEST--
-Bug #74840: Opcache overwrites argument of GENERATOR_RETURN within finally
--FILE--
-<?php
-
-$g = (function($a) {
-	try {
-		return $a + 1;
-	} finally {
-		$b = $a + 2;
-		var_dump($b);
-	}
-	yield; // Generator
-})(1);
-$g->next();
-var_dump($g->getReturn());
-
-?>
--EXPECT--
-int(3)
-int(2)
@@ -1,43 +0,0 @@
--TEST--
-Bug #74862 (Unable to clone instance when private __clone defined)
--FILE--
-<?php
-
-class a {
-    private function __clone()
-    {
-
-    }
-
-    private function __construct()
-    {
-
-    }
-
-    public static function getInstance()
-    {
-        return new static();
-    }
-
-    public function cloneIt()
-    {
-        $a = clone $this;
-
-        return $a;
-    }
-}
-
-class c extends a {
-
-}
-
-// private constructor
-$d = c::getInstance();
-
-// private clone
-$e = $d->cloneIt();
-var_dump($e);
-?>
--EXPECT--
-object(c)#2 (0) {
-}
@@ -1,46 +0,0 @@
--TEST--
-Bug #74862 (Unable to clone instance when private __clone defined in a child class)
--FILE--
-<?php
-
-class main {
-}
-
-class a extends main {
-    private function __clone()
-    {
-
-    }
-
-    private function __construct()
-    {
-
-    }
-
-    public static function getInstance()
-    {
-        return new static();
-    }
-
-    public function cloneIt()
-    {
-        $a = clone $this;
-
-        return $a;
-    }
-}
-
-class c extends a {
-
-}
-
-// private constructor
-$d = c::getInstance();
-
-// private clone
-$e = $d->cloneIt();
-var_dump($e);
-?>
--EXPECT--
-object(c)#2 (0) {
-}
@@ -1,12 +0,0 @@
--TEST--
-Bug #74947 (Segfault in scanner on INF number)
--FILE--
-<?php 
-
-echo 200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000;
-
-echo -200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000;
-
-?>
--EXPECTF--
-INF-INF
@@ -1,39 +0,0 @@
--TEST--
-Bug #75079: self keyword leads to incorrectly generated TypeError when in closure in trait
--FILE--
-<?php
-
-trait Foo
-{
-    public function selfDo(self ...$Selfs)
-    {
-        array_map(
-            function (self $Self) : self
-            {
-                return $Self;
-            },
-            $Selfs
-        );
-    }
-}
-
-class Bar
-{
-    use Foo;
-}
-
-class Baz
-{
-    use Foo;
-}
-
-$Bar = new Bar;
-$Baz = new Baz;
-
-$Bar->selfDo($Bar, $Bar);
-$Baz->selfDo($Baz, $Baz);
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,36 +0,0 @@
--TEST--
-Bug #75079 variation without traits
--FILE--
-<?php
-
-class Foo
-{
-    private static $bar = 123;
-    
-    static function test(){
-        return function(){
-            return function(){
-                return Foo::$bar;
-            };
-        };
-    }
-}
-
-
-$f = Foo::test();
-
-var_dump($f()());
-
-class A{}
-$a = new A; 
-var_dump($f->bindTo($a, A::CLASS)()());
-
-?>
--EXPECTF--
-int(123)
-
-Fatal error: Uncaught Error: Cannot access private property Foo::$bar in %s:%d
-Stack trace:
-#0 %s(%d): A->{closure}()
-#1 {main}
-  thrown in %s on line %d
@@ -1,13 +0,0 @@
--TEST--
-Bug #75241 (Null pointer dereference in zend_mm_alloc_small())
--FILE--
-<?php
-function eh(){}
-
-set_error_handler('eh');
-
-$d->d = &$d + $d->d/=0;
-var_dump($d);
-?>
--EXPECT--
-float(INF)
@@ -1,28 +0,0 @@
--TEST--
-Bug #75252: Incorrect token formatting on two parse errors in one request
--FILE--
-<?php
-
-$code = <<<'CODE'
-function test_missing_semicolon() : string {
-     $x = []
-     FOO
-}
-CODE;
-
-try {
-    eval($code);
-} catch (ParseError $e) {
-    var_dump($e->getMessage());
-}
-
-try {
-    eval($code);
-} catch (ParseError $e) {
-    var_dump($e->getMessage());
-}
-
-?>
--EXPECT--
-string(41) "syntax error, unexpected 'FOO' (T_STRING)"
-string(41) "syntax error, unexpected 'FOO' (T_STRING)"
@@ -1,26 +0,0 @@
--TEST--
-Bug #75290 (debug info of Closures of internal functions contain garbage argument names)
--FILE--
-<?php
-
-var_dump((new ReflectionFunction('sin'))->getClosure());
-
-var_dump(function ($someThing) {});
-
-?>
--EXPECT--
-object(Closure)#2 (1) {
-  ["parameter"]=>
-  array(1) {
-    ["$number"]=>
-    string(10) "<required>"
-  }
-}
-object(Closure)#2 (1) {
-  ["parameter"]=>
-  array(1) {
-    ["$someThing"]=>
-    string(10) "<required>"
-  }
-}
-
@@ -1,18 +0,0 @@
--TEST--
-Bug #75420.1 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-	public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj->$name ?? 12);
-var_dump($name);
-?>
--EXPECT--
-string(3) "foo"
-int(42)
-int(24)
@@ -1,21 +0,0 @@
--TEST--
-Bug #75420.10 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["name"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-var_dump($obj[$name] ?? 12);
-var_dump($name);
-?>
--EXPECT--
-string(6) "foofoo"
-int(42)
-int(24)
@@ -1,20 +0,0 @@
--TEST--
-Bug #75420.11 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["name"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump(empty($obj[$name]));
-var_dump($name);
-?>
--EXPECT--
-string(3) "foo"
-bool(false)
-int(24)
@@ -1,21 +0,0 @@
--TEST--
-Bug #75420.12 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["name"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-var_dump(empty($obj[$name]));
-var_dump($name);
-?>
--EXPECT--
-string(6) "foofoo"
-bool(false)
-int(24)
@@ -1,20 +0,0 @@
--TEST--
-Bug #75420.13 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["obj"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj[$name] ?? 12);
-var_dump($obj);
-?>
--EXPECT--
-string(3) "foo"
-int(42)
-int(24)
@@ -1,20 +0,0 @@
--TEST--
-Bug #75420.14 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["obj"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump(empty($obj[$name]));
-var_dump($obj);
-?>
--EXPECT--
-string(3) "foo"
-bool(false)
-int(24)
@@ -1,20 +0,0 @@
--TEST--
-Bug #75420.15 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { }
-	public function offsetGet($x) { }
-	public function offsetSet($x, $y) { $GLOBALS["name"] = 24; var_dump($x); }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-$obj[$name] = 1;
-var_dump($name);
-?>
--EXPECT--
-string(6) "foofoo"
-int(24)
@@ -1,20 +0,0 @@
--TEST--
-Bug #75420.16 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { }
-	public function offsetGet($x) { }
-	public function offsetSet($x, $y) { $GLOBALS["obj"] = 24; var_dump($this); }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-$obj[$name] = 1;
-var_dump($obj);
-?>
--EXPECT--
-object(Test)#1 (0) {
-}
-int(24)
@@ -1,20 +0,0 @@
--TEST--
-Bug #75420.2 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-	public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-var_dump($obj->$name ?? 12);
-var_dump($name);
-?>
--EXPECT--
-string(6) "foofoo"
-int(42)
-int(24)
-
@@ -1,18 +0,0 @@
--TEST--
-Bug #75420.3 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-	public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump(empty($obj->$name));
-var_dump($name);
-?>
--EXPECT--
-string(3) "foo"
-bool(false)
-int(24)
@@ -1,17 +0,0 @@
--TEST--
-Bug #75420.4 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-	public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-var_dump(empty($obj->$name));
-?>
--EXPECT--
-string(6) "foofoo"
-bool(false)
@@ -1,19 +0,0 @@
--TEST--
-Bug #75420.5 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["obj"] = 24; return true; }
-	public function __get($x) { var_dump($this); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj->$name ?? 12);
-var_dump($obj);
-?>
--EXPECT--
-object(Test)#1 (0) {
-}
-int(42)
-int(24)
@@ -1,19 +0,0 @@
--TEST--
-Bug #75420.6 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["obj"] = 24; return true; }
-	public function __get($x) { var_dump($this); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump(empty($obj->$name));
-var_dump($obj);
-?>
--EXPECT--
-object(Test)#1 (0) {
-}
-bool(false)
-int(24)
@@ -1,17 +0,0 @@
--TEST--
-Bug #75420.7 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test {
-	public function __set($x,$v) { $GLOBALS["name"] = 24; var_dump($x); }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-$obj->$name = 1;
-var_dump($name);
-?>
--EXPECT--
-string(6) "foofoo"
-int(24)
@@ -1,17 +0,0 @@
--TEST--
-Bug #75420.8 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test {
-	public function __set($x,$v) { $GLOBALS["obj"] = 24; var_dump($this); }
-}
-
-$obj = new Test;
-$name = "foo";
-$obj->$name = 1;
-var_dump($obj);
-?>
--EXPECT--
-object(Test)#1 (0) {
-}
-int(24)
@@ -1,20 +0,0 @@
--TEST--
-Bug #75420.9 (Indirect modification of magic method argument)
--FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["name"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj[$name] ?? 12);
-var_dump($name);
-?>
--EXPECT--
-string(3) "foo"
-int(42)
-int(24)
@@ -1,17 +0,0 @@
--TEST--
-Bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)
--FILE--
-<?php
-
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj->$name ?? 12);
-?>
--EXPECT--
-string(3) "foo"
-int(42)
@@ -1,64 +0,0 @@
--TEST--
-Bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
--FILE--
-<?php
-
-class A
-{
-	var $_stdObject;
-	function initialize($properties = FALSE) {
-		$this->_stdObject = $properties ? (object) $properties : new stdClass();
-		parent::initialize();
-	}
-	function &__get($property)
-	{
-		if (isset($this->_stdObject->{$property})) {
-			$retval =& $this->_stdObject->{$property};
-			return $retval;
-		} else {
-			return NULL;
-		}
-	}
-	function &__set($property, $value)
-	{
-		return $this->_stdObject->{$property} = $value;
-	}
-	function __isset($property_name)
-	{
-		return isset($this->_stdObject->{$property_name});
-	}
-}
-
-class B extends A
-{
-	function initialize($properties = array())
-	{
-		parent::initialize($properties);
-	}
-	function &__get($property)
-	{
-		if (isset($this->settings) && isset($this->settings[$property])) {
-			$retval =& $this->settings[$property];
-			return $retval;
-		} else {
-			return parent::__get($property);
-		}
-	}
-}
-
-$b = new B();
-$b->settings = [ "foo" => "bar", "name" => "abc" ];
-var_dump($b->name);
-var_dump($b->settings);
-?>
--EXPECTF--
-Warning: Creating default object from empty value in %sbug75573.php on line %d
-
-Notice: Only variable references should be returned by reference in %sbug75573.php on line %d
-string(3) "abc"
-array(2) {
-  ["foo"]=>
-  string(3) "bar"
-  ["name"]=>
-  string(3) "abc"
-}
@@ -1,18 +0,0 @@
--TEST--
-Bug #75786: segfault when using spread operator on generator passed by reference
--FILE--
-<?php
-
-function &gen($items) {
-    foreach ($items as $key => &$value) {
-        yield $key => $value;
-    }
-}
-
-var_dump(...gen(['a', 'b', 'c']));
-
-?>
--EXPECT--
-string(1) "a"
-string(1) "b"
-string(1) "c"
@@ -1,18 +0,0 @@
--TEST--
-Bug #76025 (Segfault while throwing exception in error_handler)
--FILE--
-<?php
-
-function handleError($errno, $errstr, $errfile, $errline) {
-	$exception = new exception("blah");
-	throw $exception;
-}
-set_error_handler('handleError', E_ALL);
-$c = $b[$a];
-?>
--EXPECTF--
-Fatal error: Uncaught Exception: blah in %sbug76025.php:%d
-Stack trace:
-#0 %sbug76025.php(%d): handleError(8, 'Undefined varia...', '%s', %d, Array)
-#1 {main}
-  thrown in %sbug76025.php on line %d
@@ -1,45 +0,0 @@
--TEST--
-Bug #74954 (crash after update of generator yielding from finished generator)
--FILE--
-<?php
-
-function from() {
-        yield 1;
-        throw new Exception();
-}
-
-function gen($gen) {
-        try {
-                var_dump(yield from $gen);
-        } catch (Exception $e) { print "Caught exception!\n$e\n"; }
-}
-
-$gen = from();
-$gens[] = gen($gen);
-$gens[] = gen($gen);
-
-foreach ($gens as $g) {
-        $g->current();
-}
-
-do {
-        foreach ($gens as $i => $g) {
-                $g->next();
-        }
-} while($gens[0]->valid());
-
-?>
--EXPECTF--
-Caught exception!
-Exception in %s:%d
-Stack trace:
-#0 %s(%d): from()
-#1 [internal function]: gen(Object(Generator))
-#2 %s(%d): Generator->next()
-#3 {main}
-Caught exception!
-ClosedGeneratorException: Generator yielded from aborted, no return value available in %s:%d
-Stack trace:
-#0 [internal function]: gen(Object(Generator))
-#1 %s(%d): Generator->next()
-#2 {main}
@@ -1,22 +0,0 @@
--TEST--
-Bug #75396: Exit inside generator finally results in fatal error
--FILE--
-<?php
-
-$gen = (function () {
-    yield 42;
-
-    try {
-        echo "Try\n";
-        exit("Exit\n");
-    } finally {
-        echo "Finally\n";
-    }
-})();
-
-$gen->send("x");
-
-?>
--EXPECT--
-Try
-Exit
@@ -1,27 +0,0 @@
--TEST--
-Generator GC when the yield from parent chain does not reach the root
--FILE--
-<?php
-
-function root() {
-    yield 1;
-    yield 2;
-}
-
-function delegate($gen) {
-    yield from $gen;
-}
-
-$gen = delegate(delegate(root()));
-$gen1 = delegate(delegate($gen));
-$gen2 = delegate(delegate($gen));
-var_dump($gen1->current());
-var_dump($gen2->current());
-$gen1->next();
-$gen1->next();
-gc_collect_cycles();
-
-?>
--EXPECT--
-int(1)
-int(1)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -157,7 +157,7 @@ ZEND_API zend_bool zend_dtrace_enabled;
 /* version information */
 static char *zend_version_info;
 static uint zend_version_info_length;
-#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2018 Zend Technologies\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2017 Zend Technologies\n"
 #define PRINT_ZVAL_INDENT 4

 static void zend_print_zval_r_to_buf(smart_str *buf, zval *expr, int indent);
@@ -660,10 +660,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
 	extern zend_php_scanner_globals language_scanner_globals;
 #endif

-#ifdef ZEND_WIN32
-	php_win32_cp_set_by_id(65001);
-#endif
-
 	start_memory_manager();

 	virtual_cwd_startup(); /* Could use shutdown to free the main cwd but it would just slow it down for CGI */
@@ -716,7 +712,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
 	zend_compile_file = compile_file;
 	zend_execute_ex = execute_ex;
 	zend_execute_internal = NULL;
-#endif /* HAVE_DTRACE */
+#endif /* HAVE_SYS_SDT_H */
 	zend_compile_string = compile_string;
 	zend_throw_exception_hook = NULL;

@@ -916,8 +912,6 @@ void zend_set_utility_values(zend_utility_values *utility_values) /* {{{ */
 /* this should be compatible with the standard zenderror */
 ZEND_COLD void zenderror(const char *error) /* {{{ */
 {
-	CG(parse_error) = 0;
-
 	if (EG(exception)) {
 		/* An exception was thrown in the lexer, don't throw another in the parser. */
 		return;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -279,6 +279,7 @@ ZEND_COLD void zenderror(const char *error);
 #define ZEND_STANDARD_CLASS_DEF_PTR zend_standard_class_def
 extern ZEND_API zend_class_entry *zend_standard_class_def;
 extern ZEND_API zend_utility_values zend_uv;
+extern ZEND_API zval zval_used_for_init;

 /* If DTrace is available and enabled */
 extern ZEND_API zend_bool zend_dtrace_enabled;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1088,6 +1088,8 @@ ZEND_API void zend_merge_properties(zval *obj, HashTable *properties) /* {{{ */
 ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */
 {
 	if (!(class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
+		class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
+
 		if (class_type->parent) {
 			if (UNEXPECTED(zend_update_class_constants(class_type->parent) != SUCCESS)) {
 				return FAILURE;
@@ -1156,9 +1158,7 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */
 				ce = ce->parent;
 			}
 		}
-		class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
 	}
-
 	return SUCCESS;
 }
 /* }}} */
@@ -2024,19 +2024,17 @@ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module) /
 		zend_string_release(lcname);
 		return NULL;
 	}
+	zend_string_release(lcname);
 	module = module_ptr;
 	EG(current_module) = module;

 	if (module->functions && zend_register_functions(NULL, module->functions, NULL, module->type)==FAILURE) {
-		zend_hash_del(&module_registry, lcname);
-		zend_string_release(lcname);
 		EG(current_module) = NULL;
 		zend_error(E_CORE_WARNING,"%s: Unable to register functions, unable to load", module->name);
 		return NULL;
 	}

 	EG(current_module) = NULL;
-	zend_string_release(lcname);
 	return module;
 }
 /* }}} */
@@ -2351,7 +2349,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
 		if (clone) {
 			clone->common.fn_flags |= ZEND_ACC_CLONE;
 			if (clone->common.fn_flags & ZEND_ACC_STATIC) {
-				zend_error(error_type, "%s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name));
+				zend_error(error_type, "Constructor %s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name));
 			}
 			clone->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
 		}
@@ -2411,7 +2409,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
 			zend_error_noreturn(E_CORE_ERROR, "Destructor %s::%s() cannot declare a return type", ZSTR_VAL(scope->name), ZSTR_VAL(dtor->common.function_name));
 		}

-		if (clone && (clone->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE)) {
+		if (clone && clone->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE && dtor->common.fn_flags & ZEND_ACC_DTOR) {
 			zend_error_noreturn(E_CORE_ERROR, "%s::%s() cannot declare a return type", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name));
 		}
 		efree((char*)lc_class_name);
@@ -3068,8 +3066,7 @@ get_function_via_handler:
 					    (!fcc->function_handler->common.scope ||
 					     !instanceof_function(ce_org, fcc->function_handler->common.scope))) {
 						if (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
-							if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && 
-								fcc->function_handler->common.function_name) {
+							if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) {
 								zend_string_release(fcc->function_handler->common.function_name);
 							}
 							zend_free_trampoline(fcc->function_handler);
@@ -3241,8 +3238,7 @@ again:
 				((fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) ||
 			     fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY ||
 			     fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) {
-				if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && 
-					fcc->function_handler->common.function_name) {
+				if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) {
 					zend_string_release(fcc->function_handler->common.function_name);
 				}
 				zend_free_trampoline(fcc->function_handler);
@@ -3329,8 +3325,7 @@ again:
 						((fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) ||
 					     fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY ||
 					     fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) {
-						if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && 
-							fcc->function_handler->common.function_name) {
+						if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) {
 							zend_string_release(fcc->function_handler->common.function_name);
 						}
 						zend_free_trampoline(fcc->function_handler);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -720,7 +720,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int severity, in
 		int _num_args = EX_NUM_ARGS(); \
 		int _i; \
 		zval *_real_arg, *_arg = NULL; \
-		zend_expected_type _expected_type = Z_EXPECTED_LONG; \
+		zend_expected_type _expected_type = IS_UNDEF; \
 		char *_error = NULL; \
 		zend_bool _dummy; \
 		zend_bool _optional = 0; \
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -260,8 +260,6 @@ struct _zend_mm_heap {
 	int                peak_chunks_count;		/* peak number of allocated chunks for current request */
 	int                cached_chunks_count;		/* number of cached chunks */
 	double             avg_chunks_count;		/* average number of chunks allocated per request */
-	int                last_chunks_delete_boundary; /* numer of chunks after last deletion */
-	int                last_chunks_delete_count;    /* number of deletion over the last boundary */
 #if ZEND_MM_CUSTOM
 	union {
 		struct {
@@ -285,7 +283,7 @@ struct _zend_mm_chunk {
 	uint32_t           free_pages;				/* number of free pages */
 	uint32_t           free_tail;               /* number of free pages at the end of chunk */
 	uint32_t           num;
-	char               reserve[64 - (sizeof(void*) * 3 + sizeof(uint32_t) * 3)];
+	char               reserve[64 - (sizeof(void*) * 3 + sizeof(int) * 3)];
 	zend_mm_heap       heap_slot;               /* used only in main chunk */
 	zend_mm_page_map   free_map;                /* 512 bits or 64 bytes */
 	zend_mm_page_info  map[ZEND_MM_PAGES];      /* 2 KB = 512 * 4 */
@@ -1078,9 +1076,7 @@ static zend_always_inline void zend_mm_delete_chunk(zend_mm_heap *heap, zend_mm_
 	chunk->next->prev = chunk->prev;
 	chunk->prev->next = chunk->next;
 	heap->chunks_count--;
-	if (heap->chunks_count + heap->cached_chunks_count < heap->avg_chunks_count + 0.1
-	 || (heap->chunks_count == heap->last_chunks_delete_boundary
-	  && heap->last_chunks_delete_count >= 4)) {
+	if (heap->chunks_count + heap->cached_chunks_count < heap->avg_chunks_count + 0.1) {
 		/* delay deletion */
 		heap->cached_chunks_count++;
 		chunk->next = heap->cached_chunks;
@@ -1089,14 +1085,6 @@ static zend_always_inline void zend_mm_delete_chunk(zend_mm_heap *heap, zend_mm_
 #if ZEND_MM_STAT || ZEND_MM_LIMIT
 		heap->real_size -= ZEND_MM_CHUNK_SIZE;
 #endif
-		if (!heap->cached_chunks) {
-			if (heap->chunks_count != heap->last_chunks_delete_boundary) {
-				heap->last_chunks_delete_boundary = heap->chunks_count;
-				heap->last_chunks_delete_count = 0;
-			} else {
-				heap->last_chunks_delete_count++;
-			}
-		}
 		if (!heap->cached_chunks || chunk->num > heap->cached_chunks->num) {
 			zend_mm_chunk_free(heap, chunk, ZEND_MM_CHUNK_SIZE);
 		} else {
@@ -1831,8 +1819,6 @@ static zend_mm_heap *zend_mm_init(void)
 	heap->peak_chunks_count = 1;
 	heap->cached_chunks_count = 0;
 	heap->avg_chunks_count = 1.0;
-	heap->last_chunks_delete_boundary = 0;
-	heap->last_chunks_delete_count = 0;
 #if ZEND_MM_STAT || ZEND_MM_LIMIT
 	heap->real_size = ZEND_MM_CHUNK_SIZE;
 #endif
@@ -2249,8 +2235,6 @@ void zend_mm_shutdown(zend_mm_heap *heap, int full, int silent)
 		p->map[0] = ZEND_MM_LRUN(ZEND_MM_FIRST_PAGE);
 		heap->chunks_count = 1;
 		heap->peak_chunks_count = 1;
-		heap->last_chunks_delete_boundary = 0;
-		heap->last_chunks_delete_count = 0;
 #if ZEND_MM_STAT || ZEND_MM_LIMIT
 		heap->real_size = ZEND_MM_CHUNK_SIZE;
 #endif
@@ -2783,8 +2767,6 @@ ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_handlers *handlers, void
 	heap->peak_chunks_count = 1;
 	heap->cached_chunks_count = 0;
 	heap->avg_chunks_count = 1.0;
-	heap->last_chunks_delete_boundary = 0;
-	heap->last_chunks_delete_count = 0;
 #if ZEND_MM_STAT || ZEND_MM_LIMIT
 	heap->real_size = ZEND_MM_CHUNK_SIZE;
 #endif
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend OPcache JIT                                                     |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 The PHP Group                                |
+   | Copyright (c) 1998-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -220,10 +220,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
 	ZEND_ARG_INFO(0, exception_handler)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_functions, 0, 0, 0)
-	ZEND_ARG_INFO(0, exclude_disabled)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_create_function, 0, 0, 2)
 	ZEND_ARG_INFO(0, args)
 	ZEND_ARG_INFO(0, code)
@@ -370,7 +366,7 @@ static const zend_function_entry builtin_functions[] = { /* {{{ */
 	ZEND_FE(get_declared_classes, 		arginfo_zend__void)
 	ZEND_FE(get_declared_traits, 		arginfo_zend__void)
 	ZEND_FE(get_declared_interfaces, 	arginfo_zend__void)
-	ZEND_FE(get_defined_functions, 		arginfo_get_defined_functions)
+	ZEND_FE(get_defined_functions, 		arginfo_zend__void)
 	ZEND_FE(get_defined_vars,		arginfo_zend__void)
 	ZEND_FE(create_function,		arginfo_create_function)
 	ZEND_FE(get_resource_type,		arginfo_get_resource_type)
@@ -578,7 +574,7 @@ ZEND_FUNCTION(func_get_args)
 {
 	zval *p, *q;
 	uint32_t arg_count, first_extra_arg;
-	uint32_t i;
+	uint32_t i, n;
 	zend_execute_data *ex = EX(prev_execute_data);

 	if (ZEND_CALL_INFO(ex) & ZEND_CALL_CODE) {
@@ -598,6 +594,7 @@ ZEND_FUNCTION(func_get_args)
 		zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
 		ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
 			i = 0;
+			n = 0;
 			p = ZEND_CALL_ARG(ex, 1);
 			if (arg_count > first_extra_arg) {
 				while (i < first_extra_arg) {
@@ -607,8 +604,7 @@ ZEND_FUNCTION(func_get_args)
 						if (Z_OPT_REFCOUNTED_P(q)) { 
 							Z_ADDREF_P(q);
 						}
-					} else {
-						q = &EG(uninitialized_zval);
+						n++;
 					}
 					ZEND_HASH_FILL_ADD(q);
 					p++;
@@ -623,15 +619,14 @@ ZEND_FUNCTION(func_get_args)
 					if (Z_OPT_REFCOUNTED_P(q)) { 
 						Z_ADDREF_P(q);
 					}
-				} else {
-					q = &EG(uninitialized_zval);
+					n++;
 				}
 				ZEND_HASH_FILL_ADD(q);
 				p++;
 				i++;
 			}
 		} ZEND_HASH_FILL_END();
-		Z_ARRVAL_P(return_value)->nNumOfElements = arg_count;
+		Z_ARRVAL_P(return_value)->nNumOfElements = n;
 	}
 }
 /* }}} */
@@ -1284,7 +1279,7 @@ ZEND_FUNCTION(get_object_vars)
 						zend_unmangle_property_name_ex(key, &class_name, &prop_name, &prop_len);
 						zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);
 					} else {
-						zend_symtable_add_new(Z_ARRVAL_P(return_value), key, value);
+						zend_symbtable_add_new(Z_ARRVAL_P(return_value), key, value);
 					}
 				}
 			}
@@ -2306,6 +2301,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 	array_init_size(arg_array, num_args);
 	if (num_args) {
 		uint32_t i = 0;
+		uint32_t n = 0;
 		zval *p = ZEND_CALL_ARG(call, 1);

 		zend_hash_real_init(Z_ARRVAL_P(arg_array), 1);
@@ -2328,9 +2324,12 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 							if (Z_OPT_REFCOUNTED_P(arg)) {
 								Z_ADDREF_P(arg);
 							}
+							n++;
 							ZEND_HASH_FILL_ADD(arg);
 						} else {
-							ZEND_HASH_FILL_ADD(&EG(uninitialized_zval));
+							zval tmp;
+							ZVAL_UNDEF(&tmp);
+							ZEND_HASH_FILL_ADD(&tmp);
 						}
 						i++;
 					}
@@ -2340,10 +2339,9 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 							if (Z_OPT_REFCOUNTED_P(p)) {
 								Z_ADDREF_P(p);
 							}
-							ZEND_HASH_FILL_ADD(p);
-						} else {
-							ZEND_HASH_FILL_ADD(&EG(uninitialized_zval));
+							n++;
 						}
+						ZEND_HASH_FILL_ADD(p);
 						p++;
 						i++;
 					}
@@ -2356,15 +2354,14 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 					if (Z_OPT_REFCOUNTED_P(p)) {
 						Z_ADDREF_P(p);
 					}
-					ZEND_HASH_FILL_ADD(p);
-				} else {
-					ZEND_HASH_FILL_ADD(&EG(uninitialized_zval));
+					n++;
 				}
+				ZEND_HASH_FILL_ADD(p);
 				p++;
 				i++;
 			}
 		} ZEND_HASH_FILL_END();
-		Z_ARRVAL_P(arg_array)->nNumOfElements = num_args;
+		Z_ARRVAL_P(arg_array)->nNumOfElements = n;
 	}
 }
 /* }}} */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -186,7 +186,7 @@ ZEND_METHOD(Closure, call)
 ZEND_METHOD(Closure, bind)
 {
 	zval *newthis, *zclosure, *scope_arg = NULL;
-	zend_closure *closure;
+	zend_closure *closure, *new_closure;
 	zend_class_entry *ce, *called_scope;

 	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oo!|z", &zclosure, zend_ce_closure, &newthis, &scope_arg) == FAILURE) {
@@ -226,6 +226,15 @@ ZEND_METHOD(Closure, bind)
 	}

 	zend_create_closure(return_value, &closure->func, ce, called_scope, newthis);
+	new_closure = (zend_closure *) Z_OBJ_P(return_value);
+
+	/* Runtime cache relies on bound scope to be immutable, hence we need a separate rt cache in case scope changed */
+	if (ZEND_USER_CODE(closure->func.type) && (closure->func.common.scope != new_closure->func.common.scope || (closure->func.op_array.fn_flags & ZEND_ACC_NO_RT_ARENA))) {
+		new_closure->func.op_array.run_time_cache = emalloc(new_closure->func.op_array.cache_size);
+		memset(new_closure->func.op_array.run_time_cache, 0, new_closure->func.op_array.cache_size);
+
+		new_closure->func.op_array.fn_flags |= ZEND_ACC_NO_RT_ARENA;
+	}
 }
 /* }}} */

@@ -235,7 +244,7 @@ static void zend_closure_call_magic(INTERNAL_FUNCTION_PARAMETERS) /* {{{ */ {
 	zval params[2];

 	memset(&fci, 0, sizeof(zend_fcall_info));
-	memset(&fcc, 0, sizeof(zend_fcall_info_cache));
+	memset(&fci, 0, sizeof(zend_fcall_info_cache));

 	fci.size = sizeof(zend_fcall_info);
 	fci.retval = return_value;
@@ -494,7 +503,6 @@ static HashTable *zend_closure_get_debug_info(zval *object, int *is_temp) /* {{{
 	zval val;
 	struct _zend_arg_info *arg_info = closure->func.common.arg_info;
 	HashTable *debug_info;
-	zend_bool zstr_args = (closure->func.type == ZEND_USER_FUNCTION) || (closure->func.common.fn_flags & ZEND_ACC_USER_ARG_INFO);

 	*is_temp = 1;

@@ -527,15 +535,9 @@ static HashTable *zend_closure_get_debug_info(zval *object, int *is_temp) /* {{{
 			zend_string *name;
 			zval info;
 			if (arg_info->name) {
-				if (zstr_args) {
-					name = zend_strpprintf(0, "%s$%s",
-							arg_info->pass_by_reference ? "&" : "",
-							ZSTR_VAL(arg_info->name));
-				} else {
-					name = zend_strpprintf(0, "%s$%s",
-							arg_info->pass_by_reference ? "&" : "",
-							((zend_internal_arg_info*)arg_info)->name);
-				}
+				name = zend_strpprintf(0, "%s$%s",
+						arg_info->pass_by_reference ? "&" : "",
+						ZSTR_VAL(arg_info->name));
 			} else {
 				name = zend_strpprintf(0, "%s$param%d",
 						arg_info->pass_by_reference ? "&" : "",
@@ -660,24 +662,9 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent
 			closure->func.op_array.static_variables =
 				zend_array_dup(closure->func.op_array.static_variables);
 		}
-
-		/* Runtime cache is scope-dependent, so we cannot reuse it if the scope changed */
-		if (!closure->func.op_array.run_time_cache
-			|| func->common.scope != scope
-			|| (func->common.fn_flags & ZEND_ACC_NO_RT_ARENA)
-		) {
-			if (!func->op_array.run_time_cache && (func->common.fn_flags & ZEND_ACC_CLOSURE)) {
-				/* If a real closure is used for the first time, we create a shared runtime cache
-				 * and remember which scope it is for. */
-				func->common.scope = scope;
-				func->op_array.run_time_cache = zend_arena_alloc(&CG(arena), func->op_array.cache_size);
-				closure->func.op_array.run_time_cache = func->op_array.run_time_cache;
-			} else {
-				/* Otherwise, we use a non-shared runtime cache */
-				closure->func.op_array.run_time_cache = emalloc(func->op_array.cache_size);
-				closure->func.op_array.fn_flags |= ZEND_ACC_NO_RT_ARENA;
-			}
-			memset(closure->func.op_array.run_time_cache, 0, func->op_array.cache_size);
+		if (UNEXPECTED(!closure->func.op_array.run_time_cache)) {
+			closure->func.op_array.run_time_cache = func->op_array.run_time_cache = zend_arena_alloc(&CG(arena), func->op_array.cache_size);
+			memset(func->op_array.run_time_cache, 0, func->op_array.cache_size);
 		}
 		if (closure->func.op_array.refcount) {
 			(*closure->func.op_array.refcount)++;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -6261,7 +6261,7 @@ void zend_compile_use(zend_ast *ast) /* {{{ */
 			zend_string *ns_name = zend_string_alloc(ZSTR_LEN(current_ns) + 1 + ZSTR_LEN(new_name), 0);
 			zend_str_tolower_copy(ZSTR_VAL(ns_name), ZSTR_VAL(current_ns), ZSTR_LEN(current_ns));
 			ZSTR_VAL(ns_name)[ZSTR_LEN(current_ns)] = '\\';
-			memcpy(ZSTR_VAL(ns_name) + ZSTR_LEN(current_ns) + 1, ZSTR_VAL(lookup_name), ZSTR_LEN(lookup_name) + 1);
+			memcpy(ZSTR_VAL(ns_name) + ZSTR_LEN(current_ns) + 1, ZSTR_VAL(lookup_name), ZSTR_LEN(lookup_name));

 			zend_check_use_conflict(type, old_name, new_name, ns_name);

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -213,10 +213,9 @@ static zend_always_inline zval *_get_zval_ptr_var_deref(uint32_t var, const zend

 static zend_never_inline ZEND_COLD void zval_undefined_cv(uint32_t var, const zend_execute_data *execute_data)
 {
-	if (EXPECTED(EG(exception) == NULL)) {
-		zend_string *cv = CV_DEF_OF(EX_VAR_TO_NUM(var));
-		zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(cv));
-	}
+	zend_string *cv = CV_DEF_OF(EX_VAR_TO_NUM(var));
+
+	zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(cv));
 }

 static zend_never_inline zval *_get_zval_cv_lookup(zval *ptr, uint32_t var, int type, const zend_execute_data *execute_data)
@@ -1721,9 +1720,16 @@ fetch_from_array:
 				zend_error(E_NOTICE, "Indirect modification of overloaded element of %s has no effect", ZSTR_VAL(ce->name));
 			} else if (EXPECTED(retval && Z_TYPE_P(retval) != IS_UNDEF)) {
 				if (!Z_ISREF_P(retval)) {
-					if (result != retval) {
-						ZVAL_COPY(result, retval);
-						retval = result;
+					if (Z_REFCOUNTED_P(retval) &&
+					    Z_REFCOUNT_P(retval) > 1) {
+						if (Z_TYPE_P(retval) != IS_OBJECT) {
+							Z_DELREF_P(retval);
+							ZVAL_DUP(result, retval);
+							retval = result;
+						} else {
+							ZVAL_COPY_VALUE(result, retval);
+							retval = result;
+						}
 					}
 					if (Z_TYPE_P(retval) != IS_OBJECT) {
 						zend_class_entry *ce = Z_OBJCE_P(container);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -179,15 +179,13 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 		zend_generator *root = generator->node.ptr.root, *next;
 		while (UNEXPECTED(root != generator)) {
 			next = zend_generator_get_child(&root->node, generator);
-			generator->node.ptr.root = next;
-			next->node.parent = NULL;
 			OBJ_RELEASE(&root->std);
 			root = next;
 		}
+		generator->node.parent = NULL;
 	}

-	if (EXPECTED(!ex) || EXPECTED(!(ex->func->op_array.fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK))
-			|| CG(unclean_shutdown)) {
+	if (EXPECTED(!ex) || EXPECTED(!(ex->func->op_array.fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK))) {
 		return;
 	}

@@ -276,9 +274,9 @@ static uint32_t calc_gc_buffer_size(zend_generator *generator) /* {{{ */

 		/* Yield from root references */
 		if (generator->node.children == 0) {
-			zend_generator *root = generator->node.ptr.root;
-			while (root != generator) {
-				root = zend_generator_get_child(&root->node, generator);
+			zend_generator *child = generator, *root = generator->node.ptr.root;
+			while (root != child) {
+				child = child->node.parent;
 				size++;
 			}
 		}
@@ -341,10 +339,10 @@ static HashTable *zend_generator_get_gc(zval *object, zval **table, int *n) /* {
 	}

 	if (generator->node.children == 0) {
-		zend_generator *root = generator->node.ptr.root;
-		while (root != generator) {
-			ZVAL_OBJ(gc_buffer++, &root->std);
-			root = zend_generator_get_child(&root->node, generator);
+		zend_generator *child = generator, *root = generator->node.ptr.root;
+		while (root != child) {
+			child = child->node.parent;
+			ZVAL_OBJ(gc_buffer++, &child->std);
 		}
 	}

@@ -665,12 +663,11 @@ ZEND_API zend_generator *zend_generator_update_current(zend_generator *generator
 		}
 	}

-	leaf->node.ptr.root = root;
 	if (old_root) {
 		OBJ_RELEASE(&old_root->std);
 	}

-	return root;
+	return leaf->node.ptr.root = root;
 }

 static int zend_generator_get_next_delegated_value(zend_generator *generator) /* {{{ */
@@ -760,13 +757,15 @@ failure:

 ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
 {
-	zend_generator *generator = zend_generator_get_current(orig_generator);
+	zend_generator *generator;

 	/* The generator is already closed, thus can't resume */
-	if (UNEXPECTED(!generator->execute_data)) {
+	if (UNEXPECTED(!orig_generator->execute_data)) {
 		return;
 	}

+	generator = zend_generator_get_current(orig_generator);
+
 try_again:
 	if (generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING) {
 		zend_throw_error(NULL, "Cannot resume an already running generator");
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -279,6 +279,7 @@ static uint32_t zend_array_recalc_elements(HashTable *ht)
       uint32_t num = ht->nNumOfElements;

 	   ZEND_HASH_FOREACH_VAL(ht, val) {
+		   if (Z_TYPE_P(val) == IS_UNDEF) continue;
 		   if (Z_TYPE_P(val) == IS_INDIRECT) {
 			   if (UNEXPECTED(Z_TYPE_P(Z_INDIRECT_P(val)) == IS_UNDEF)) {
 				   num--;
@@ -1765,7 +1766,7 @@ ZEND_API HashTable* ZEND_FASTCALL zend_array_dup(HashTable *source)
 	GC_TYPE_INFO(target) = IS_ARRAY;

 	target->nTableSize = source->nTableSize;
-	target->pDestructor = ZVAL_PTR_DTOR;
+	target->pDestructor = source->pDestructor;

 	if (source->nNumUsed == 0) {
 		target->u.flags = (source->u.flags & ~(HASH_FLAG_INITIALIZED|HASH_FLAG_PACKED|HASH_FLAG_PERSISTENT|ZEND_HASH_APPLY_COUNT_MASK)) | HASH_FLAG_APPLY_PROTECTION | HASH_FLAG_STATIC_KEYS;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -337,7 +337,7 @@ static zend_always_inline int zend_hash_str_exists_ind(const HashTable *ht, cons
 			Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF);
 }

-static zend_always_inline zval *zend_symtable_add_new(HashTable *ht, zend_string *key, zval *pData)
+static zend_always_inline zval *zend_symbtable_add_new(HashTable *ht, zend_string *key, zval *pData)
 {
 	zend_ulong idx;

@@ -348,10 +348,6 @@ static zend_always_inline zval *zend_symtable_add_new(HashTable *ht, zend_string
 	}
 }

-/* This typo snuck into 7.0.17 and 7.1.3, this define exists for BC */
-#define zend_symbtable_add_new(ht, key, pData) \
-        zend_symtable_add_new(ht, key, pData)
-
 static zend_always_inline zval *zend_symtable_update(HashTable *ht, zend_string *key, zval *pData)
 {
 	zend_ulong idx;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
Author	SHA1	Message	Date
Joe Watkins	5b34dc2d52	set versions	2017-06-07 09:05:10 +01:00
Joe Watkins	01990286f6	set versions for 7.1.6RC1	2017-05-23 22:01:56 +01:00