set release versions

update NEWS
Merge branch 'PHP-5.6' into PHP-7.0
2026-11-13 04:00:50 +00:00 · 2016-11-08 13:17:14 +01:00 · 2016-11-08 13:16:20 +01:00 · 2016-11-08 13:03:27 +01:00 · 2016-11-08 13:02:49 +01:00 · 2016-11-08 13:02:19 +01:00
1353 changed files with 19434 additions and 42259 deletions
@@ -1,57 +0,0 @@
-
-version: "{branch}.build.{build}"
-
-image: Visual Studio 2015
-
-branches:
-        except:
-                - PHP-5.6
-                - PHP-7.0
-
-skip_commits:
-        files:
-                - NEWS
-                - UPGRADING*
-                - README.*
-
-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.0.5
-        # ext and env setup for tests
-        #MYSQL_TEST_PASSWD: Password12!
-        #MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=root password=Password12!"
-        #PDO_MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_PASS: Password12!
-        #PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
-        #PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
-        #build permutations
-        matrix:
-                - THREAD_SAFE: 0
-                  OPCACHE: 0
-                - THREAD_SAFE: 1
-                  OPCACHE: 1
-
-services:
-        # the setup scripts have to be touched, once some other db version is used
-        - mysql
-        - postgresql96
-
-platform:
-        - x64
-          #        - x86
-
-build_script:
-        - appveyor\build.bat
-
-test_script:
-        - appveyor\test.bat
-
@@ -29,33 +29,22 @@ document ____executor_globals
 end

 define print_cvs
-	if $argc == 0
-		____executor_globals
-		set $cv_ex_ptr = $eg.current_execute_data
-	else
-		set $cv_ex_ptr = (zend_execute_data *)$arg0
+	____executor_globals
+	set $p = $eg.current_execute_data.CVs
+	set $c = $eg.current_execute_data.op_array.last_var
+	set $v = $eg.current_execute_data.op_array.vars
+	set $i = 0
+
+	printf "Compiled variables count: %d\n", $c
+	while $i < $c
+		printf "%d = %s\n", $i, $v[$i].name
+		if $p[$i] != 0
+			printzv *$p[$i]
+		else
+			printf "*uninitialized*\n"
+		end
+		set $i = $i + 1
 	end
-	set $cv_count = $cv_ex_ptr.func.op_array.last_var
-	set $cv = $cv_ex_ptr.func.op_array.vars
-	set $cv_idx = 0
-	set $callFrameSize = (sizeof(zend_execute_data) + sizeof(zval) - 1) / sizeof(zval)
-
-	printf "Compiled variables count: %d\n\n", $cv_count
-	while $cv_idx < $cv_count
-		printf "[%d] '%s'\n", $cv_idx, $cv[$cv_idx].val
-		set $zvalue = ((zval *) $cv_ex_ptr) + $callFrameSize + $cv_idx
-		printzv $zvalue
-		set $cv_idx = $cv_idx + 1
-	end
-end
-
-document print_cvs
-	Prints the compiled variables and their values.
-	If a zend_execute_data pointer is set this will print the compiled
-	variables of that scope. If no parameter is used it will use
-	current_execute_data for scope.
-
-	usage: print_cvs [zend_execute_data *]
 end

 define dump_bt
@@ -207,17 +196,12 @@ define ____printzv_contents
 		____executor_globals
 		set $handle = $zvalue->value.obj.handle
 		set $handlers = $zvalue->value.obj.handlers
-		set $zobj = $zvalue->value.obj
-		set $cname = $zobj->ce->name->val
+        set $zobj = $zvalue->value.obj
+        set $cname = $zobj->ce->name->val
 		printf "(%s) #%d", $cname, $handle
 		if ! $arg1
 			if $handlers->get_properties == &zend_std_get_properties
-				if $zobj->properties
-					set $ht = $zobj->properties
-				else
-					set $ht = &$zobj->ce->properties_info
-				end
-				printf "\nProperties "
+				set $ht = $zobj->properties
 				if $ht
 					set $ind = $ind + 1
 					____print_ht $ht 1
@@ -228,7 +212,7 @@ define ____printzv_contents
 						set $i = $i - 1
 					end
 				else
-					echo "not found"
+					echo "no properties found"
 				end
 			end
 		end
@@ -471,9 +455,9 @@ define print_inh
 end

 define print_pi
-	set $pi = (zend_property_info *)$arg0
+	set $pi = $arg0
 	printf "[%p] {\n", $pi
-	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
+	printf "    h     = %lu\n", $pi->h
 	printf "    flags = %d (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
@@ -492,27 +476,16 @@ define print_pi
 	end
 	printf ")\n"
 	printf "    name  = "
-	print_zstr $pi->name
-	printf "}\n"
-end
-
-document print_pi
-	Takes a pointer to an object's property and prints the property information
-	usage: print_pi <ptr>
+	____print_str $pi->name $pi->name_length
+	printf "\n}\n"
 end

 define ____print_str
 	set $tmp = 0
 	set $str = $arg0
-	if $argc > 2
-		set $maxlen = $arg2
-	else
-		set $maxlen = 256
-	end
-
 	printf "\""
-	while $tmp < $arg1 && $tmp < $maxlen
-		if $str[$tmp] > 31 && $str[$tmp] < 127
+	while $tmp < $arg1 && $tmp < 256
+		if $str[$tmp] > 32 && $str[$tmp] < 127
 			printf "%c", $str[$tmp]
 		else
 			printf "\\%o", $str[$tmp]
@@ -581,23 +554,6 @@ document printzops
 	dump operands of the current opline
 end

-define print_zstr
-	set $zstr = (zend_string *)$arg0
-	if $argc == 2
-		set $maxlen = $arg1
-	else
-		set $maxlen = $zstr->len
-	end
-	printf "string(%d) ", $zstr->len
-	____print_str $zstr->val $zstr->len $maxlen
-	printf "\n"
-end
-
-document print_zstr
-	print the length and contents of a zend string
-	usage: print_zstr <ptr> [max length]
-end
-
 define zbacktrace
 	____executor_globals
 	dump_bt $eg.current_execute_data
@@ -610,6 +566,79 @@ document zbacktrace
 	> (gdb) dump_bt $eg.current_execute_data
 end

+define zmemcheck
+	set $p = alloc_globals.head
+	set $stat = "?"
+	set $total_size = 0
+	if $arg0 != 0
+		set $not_found = 1
+	else
+		set $not_found = 0
+	end
+	printf " block      size      status file:line\n"
+	printf "-------------------------------------------------------------------------------\n"
+	while $p
+		set $aptr = $p + sizeof(struct _zend_mem_header) + sizeof(align_test)
+		if $arg0 == 0 || (void *)$aptr == (void *)$arg0
+			if $p->magic == 0x7312f8dc 
+				set $stat = "OK"
+			end
+			if $p->magic == 0x99954317
+				set $stat = "FREED"
+			end
+			if $p->magic == 0xfb8277dc
+				set $stat = "CACHED"
+			end
+			set $filename = strrchr($p->filename->val, '/')
+			if !$filename
+				set $filename = $p->filename->val
+			else
+				set $filename = $filename + 1
+			end
+			printf " %p ", $aptr
+			if $p->size == sizeof(struct _zval_struct) && ((struct _zval_struct *)$aptr)->type >= 0 && ((struct _zval_struct *)$aptr)->type < 10
+				printf "ZVAL?(%-2d) ", $p->size
+			else
+				printf "%-9d ", $p->size
+			end
+			set $total_size = $total_size + $p->size
+			printf "%-06s %s:%d", $stat, $filename, $p->lineno
+			if $p->orig_filename
+				set $orig_filename = strrchr($p->orig_filename, '/')
+				if !$orig_filename
+					set $orig_filename = $p->orig_filename
+				else
+					set $orig_filename = $orig_filename + 1
+				end
+				printf " <= %s:%d\n", $orig_filename, $p->orig_lineno
+			else
+				printf "\n"
+			end
+			if $arg0 != 0
+				set $p = 0
+				set $not_found = 0
+			else
+				set $p = $p->pNext
+			end
+		else
+			set $p = $p->pNext
+		end
+	end
+	if $not_found
+		printf "no such block that begins at %p.\n", $aptr
+	end
+	if $arg0 == 0
+		printf "-------------------------------------------------------------------------------\n"
+		printf "     total: %d bytes\n", $total_size
+	end
+end
+
+document zmemcheck
+	show status of a memory block.
+	usage: zmemcheck [ptr].
+	if ptr is 0, all blocks will be listed.
+end
+
 define lookup_root
 	set $found = 0
 	if gc_globals->roots
@@ -286,7 +286,7 @@ MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>, Christoph M. Becker <cmb@php.net>
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2017 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2016 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ install-headers:
 			paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
 		done; \
 		$(mkinstalldirs) $$paths && \
-		echo "Installing header files:          $(INSTALL_ROOT)$(phpincludedir)/" && \
+		echo "Installing header files:           $(INSTALL_ROOT)$(phpincludedir)/" && \
 		for i in `echo $(INSTALL_HEADERS)`; do \
 			if test "$(PHP_PECL_EXTENSION)"; then \
 				src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
@@ -1,538 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-06 Jul 2017 PHP 7.0.21
-
- 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 #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 #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability).
-    (Stas)
-  . Fixed bug #74819 (wddx_deserialize() heap out-of-bound read via
-    php_parse_date()). (Derick)
-
- 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)
-  . Fixed bug #73634 (grapheme_strpos illegal memory access). (Stas)
-
- 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)
-
- OpenSSL:
-  . Fixed bug #74651 (negative-size-param (-1) in memcpy in zif_openssl_seal()).
-    (Stas)
-
- PCRE:
-  . Fixed bug #74087 (Segmentation fault in PHP7.1.1(compiled using the bundled PCRE library)).
-    (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)
-
- Standard:
-  . Fixed bug #74708 (Invalid Reflection signatures for random_bytes and
-    random_int). (Tyson Andre, Remi)
-  . Fixed bug #73648 (Heap buffer overflow in substr). (Stas)
-
- 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.0.20
-
- Core:
-  . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).
-    (Laruence)
-  . Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST).
-    (Laruence)
-
- intl:
-  . Fixed bug #74468 (wrong reflection on Collator::sortWithSortKeys). (villfa)
-
- MySQLi:
-  . Fixed bug #74547 (mysqli::change_user() doesn't accept null as $database
-    argument w/strict_types). (Anatol)
-
- Opcache:
-  . Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled). (Laruence)
-
- phar:
-  . Fixed bug #51918 (Phar::webPhar() does not handle requests sent through PUT
-    and DELETE method). (Christian Weiske)
-
- Standard:
-  . Fixed bug #74510 (win32/sendmail.c anchors CC header but not BCC).
-    (Damian Wadley, Anatol)
-
- xmlreader:
-  . Fixed bug #74457 (Wrong reflection on XMLReader::expand). (villfa)
-
-11 May 2017 PHP 7.0.19
-
- Core:
-  . Fixed bug #74188 (Null coalescing operator fails for undeclared static
-    class properties). (tpunt)
-  . Fixed bug #74408 (Endless loop bypassing execution time limit). (Laruence)
-  . Fixed bug #74410 (stream_select() is broken on Windows Nanoserver).
-    (Matt Ficken)
-  . Fixed bug #74337 (php-cgi.exe crash on facebook callback).
-    (Anton Serbulov)
-  . Patch for bug #74216 was reverted. (Anatol)
-
- Date:
-  . Fixed bug #74404 (Wrong reflection on DateTimeZone::getTransitions).
-    (krakjoe)
-  . Fixed bug #74080 (add constant for RFC7231 format datetime). (duncan3dc)
-
- DOM:
-  . Fixed bug #74416 (Wrong reflection on DOMNode::cloneNode).
-    (Remi, Fabien Villepinte)
-
- Fileinfo:
-  . Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c).
-    (Laruence)
-
- GD:
-  . Fixed bug #74343 (compile fails on solaris 11 with system gd2 library).
-    (krakjoe)
-
- intl:
-  . Fixed bug #74433 (wrong reflection for Normalizer methods). (villfa)
-  . Fixed bug #74439 (wrong reflection for Locale methods). (villfa)
-
- MySQLi:
-  . Fixed bug #74432 (mysqli_connect adding ":3306" to $host if $port parameter
-    not given). (Anatol)
-
- MySQLnd:
-  . Added support for MySQL 8.0 types. (Johannes)
-  . Fixed bug #74376 (Invalid free of persistent results on error/connection
-    loss). (Yussuf Khalil)
-
- OpenSSL:
-  . Fixed bug #73833 (null character not allowed in openssl_pkey_get_private).
-    (Jakub Zelenka)
-  . Fixed bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH
-    key). (Jakub Zelenka)
-  . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without
-    seconds). (Moritz Fain)
-  . Added OpenSSL 1.1.0 support. (Jakub Zelenka)
-
- phar:
-  . Fixed bug #74383 (phar method parameters reflection correction). 
-    (mhagstrand)
-
- Standard:
-  . Fixed bug #74409 (Reflection information for ini_get_all() is incomplete).
-    (Sebastian Bergmann)
-  . Fixed bug #72071 (setcookie allows max-age to be negative). (Craig Duncan)
-
- Streams:
-  . Fixed bug #74429 (Remote socket URI with unique persistence identifier
-    broken). (Sara)
-
- SQLite3:
-  . Fixed bug #74413 (incorrect reflection for SQLite3::enableExceptions).
-    (krakjoe)
-
-13 Apr 2017 PHP 7.0.18
-
- Core:
-  . Fixed bug #73370 (falsely exits with "Out of Memory" when using
-    USE_ZEND_ALLOC=0). (Nikita)
-  . Fixed bug #73960 (Leak with instance method calling static method with
-    referenced return). (Nikita)
-  . Fixed bug #74265 (Build problems after 7.0.17 release: undefined reference
-    to `isfinite'). (Nikita)
-  . Fixed bug #74302 (yield fromLABEL is over-greedy). (Sara)
-
- Apache:
-  . Reverted patch for bug #61471, fixes bug #74318. (Anatol)
-
- Date:
-  . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)
-
- DOM:
-  . Fixed bug #74004 (LIBXML_NOWARNING flag ingnored on loadHTML*).
-    (somedaysummer)
-
- iconv:
-  . Fixed bug #74230 (iconv fails to fail on surrogates). (Anatol)
-
- OCI8:
-  . Fixed uninitialized data causing random crash. (Dmitry)
-
- OpenSSL:
-  . Fixed bug #72333 (fwrite() on non-blocking SSL sockets doesn't work).
-    (Jakub Zelenka)
-
- PDO MySQL:
-  . Fixed bug #71003 (Expose MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT to PDO
-    interface). (Thomas Orozco)
-
- Streams:
-  . Fixed bug #74216 (Correctly fail on invalid IP address ports). (Sara)
-
- Zlib:
-  . Fixed bug #74240 (deflate_add can allocate too much memory). (Matt Bonneau)
-
-16 Mar 2017 PHP 7.0.17
-
- Core:
-  . Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite).
-    (Dmitry, Laruence)
-  . Fixed bug #74084 (Out of bound read - zend_mm_alloc_small). (Laruence)
-  . Fixed bug #73807 (Performance problem with processing large post request).
-    (Nikita)
-  . Fixed bug #73998 (array_key_exists fails on arrays created by
-    get_object_vars). (mhagstrand)
-  . Fixed bug #73954 (NAN check fails on Alpine Linux with musl). (Andrea)
-  . Fixed bug #74039 (is_infinite(-INF) returns false). (Christian Schmidt)
-  . Fixed bug #73677 (Generating phar.phar core dump with gcc ASAN enabled
-    build). (ondrej)
-
- Apache:
-  . Fixed bug #61471 (Incomplete POST does not timeout but is passed to PHP).
-    (Zheng Shao)
-
- Date:
-  . Fixed bug #72719 (Relative datetime format ignores weekday on sundays
-    only). (Derick)
-  . Fixed bug #73294 (DateTime wrong when date string is negative). (Derick)
-  . Fixed bug #73489 (wrong timestamp when call setTimeZone multi times with
-    UTC offset). (xiami, Derick)
-  . Fixed bug #73858 (first/last day of' flag is not being reset). (Derick)
-  . Fixed bug #73942 ($date->modify('Friday this week') doesn't return a Friday
-    if $date is a Sunday). (Derick)
-  . Fixed bug #74057 (wrong day when using "this week" in strtotime). (Derick)
-
- FPM:
-  . Fixed bug #69860 (php-fpm process accounting is broken with keepalive).
-    (Denis Yeldandi)
-
- Hash:
-  . Fixed bug #73127 (gost-crypto hash incorrect if input data contains long
-    0xFF sequence). (Grundik)
-
- GD:
-  . Fixed bug #74031 (ReflectionFunction for imagepng is missing last two
-    parameters). (finwe)
-
- Mysqlnd:
-  . Fixed bug #74021 (fetch_array broken data. Data more then MEDIUMBLOB).
-    (Andrew Nester, Nikita)
-
- Opcache:
-  . Fixed bug #74152 (if statement says true to a null variable). (Laruence)
-  . Fixed bug #74019 (Segfault with list). (Laruence)
-
- OpenSSL:
-  . Fixed bug #74022 (PHP Fast CGI crashes when reading from a pfx file).
-    (Anatol)
-
- PDO_OCI:
-  . Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated). (gureedo / Oracle)
-
- Standard:
-  . Fixed bug #74148 (ReflectionFunction incorrectly reports the number of
-    arguments). (Laruence)
-  . Fixed bug #74005 (mail.add_x_header causes RFC-breaking lone line feed).
-    (Anatol)
-  . Fixed bug #73118 (is_callable callable name reports misleading value for
-    anonymous classes). (Adam Saponara)
-  . Fixed bug #74105 (PHP on Linux should use /dev/urandom when getrandom is
-    not available). (Benjamin Robin)
-
- Streams:
-  . Fixed bug #73496 (Invalid memory access in zend_inline_hash_func).
-    (Laruence)
-  . Fixed bug #74090 (stream_get_contents maxlength>-1 returns empty string).
-    (Anatol)
-
-
-16 Feb 2017 PHP 7.0.16
-
- Core:
-  . Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference).
-    (Laruence)
-  . Fixed bug #73876 (Crash when exporting **= in expansion of assign op).
-    (Sara)
-  . Fixed bug #73969 (segfault in debug_print_backtrace). (andrewnester)
-  . Fixed bug #73973 (assertion error in debug_zval_dump). (andrewnester)
-
- DOM:
-  . Fixed bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes).
-    (aboks)
-
- DTrace:
-  . Fixed bug #73965 (DTrace reported as enabled when disabled). (Remi)
-
- FPM:
-  . Fixed bug #67583 (double fastcgi_end_request on max_children limit).
-    (Dmitry Saprykin)
-  . Fixed bug #69865 (php-fpm does not close stderr when using syslog). 
-    (m6w6)
-
- GD:
-  . Fixed bug #73968 (Premature failing of XBM reading). (cmb)
-
- GMP:
-  . Fixed bug #69993 (test for gmp.h needs to test machine includes).
-    (Jordan Gigov) 
-
- Intl:
-  . Fix bug #73956 (Link use CC instead of CXX). (Remi)
-
- LDAP:
-  . Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache).
-    (Laruence)
-
- MySQLi:
-  . Fixed bug #73949 (leak in mysqli_fetch_object). (krakjoe)
-
- Mysqlnd:
-  . Fixed bug #69899 (segfault on close() after free_result() with mysqlnd).
-    (Richard Fussenegger)
-
- Opcache:
-  . Fixed bug #73983 (crash on finish work with phar in cli + opcache).
-    (Anatol)
-
- OpenSSL:
-  . Fixed bug #71519 (add serial hex to return value array). (xrobau)
-
- PDO_Firebird:
-  . Implemented FR #72583 (All data are fetched as strings). (Dorin Marcoci)
-
- PDO_PgSQL:
-  . Fixed bug #73959 (lastInsertId fails to throw an exception for wrong 
-    sequence name). (andrewnester)
-
- Phar:
-  . Fixed bug #70417 (PharData::compress() doesn't close temp file). (cmb)
-
- posix:
-  . Fixed bug #71219 (configure script incorrectly checks for ttyname_r). (atoth)
-
- Session:
-  . Fixed bug #69582 (session not readable by root in CLI). (EvgeniySpinov)
-
- SPL:
-  . Fixed bug #73896 (spl_autoload() crashes when calls magic _call()). (Dmitry)
-
- Standard:
-  . Fixed bug #69442 (closing of fd incorrect when PTS enabled). (jaytaph)
-  . Fixed bug #47021 (SoapClient stumbles over WSDL delivered with
-    "Transfer-Encoding: chunked"). (Rowan Collins)
-  . Fixed bug #72974 (imap is undefined service on AIX). (matthieu.sarter)
-  . Fixed bug #72979 (money_format stores wrong length AIX). (matthieu.sarter)
-
- ZIP:
-  . Fixed bug #70103 (ZipArchive::addGlob ignores remove_all_path option). (cmb,
-    Mitch Hagstrand)
-
-19 Jan 2017 PHP 7.0.15
-
- Core:
-  . Fixed bug #73792 (invalid foreach loop hangs script). (Dmitry)
-  . Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created
-    with list()). (Laruence)
-  . Fixed bug #73585 (Logging of "Internal Zend error - Missing class
-    information" missing class name). (Laruence)
-  . Fixed bug #73753 (unserialized array pointer not advancing). (David Walker)
-  . Fixed bug #73825 (Heap out of bounds read on unserialize in
-    finish_nested_data()). (Stas)
-  . Fixed bug #73831 (NULL Pointer Dereference while unserialize php object).
-    (Stas)
-  . Fixed bug #73832 (Use of uninitialized memory in unserialize()). (Stas)
-  . Fixed bug #73092 (Unserialize use-after-free when resizing object's
-    properties hash table). (Nikita)
-  . Fixed bug #69425 (Use After Free in unserialize()). (Nikita)
-  . Fixed bug #72731 (Type Confusion in Object Deserialization). (Nikita)
-
- COM:
-  . Fixed bug #73679 (DOTNET read access violation using invalid codepage).
-    (Anatol)
-
- DOM:
-  . Fixed bug #67474 (getElementsByTagNameNS filter on default ns). (aboks)
-
- EXIF:
-  . Bug bug #73737 (FPE when parsing a tag format). (Stas)
-
- GD:
-  . Fixed bug #73869 (Signed Integer Overflow gd_io.c). (cmb)
-  . Fixed bug #73868 (DOS vulnerability in gdImageCreateFromGd2Ctx()). (cmb)
-
- GMP:
-  . Fixed bug #70513 (GMP Deserialization Type Confusion Vulnerability).
-    (Nikita)
-
- Mysqli:
-  . Fixed bug #73462 (Persistent connections don't set $connect_errno).
-    (darkain)
-
- Mysqlnd:
-  . Fixed issue with decoding BIT columns when having more than one rows in the
-    result set. 7.0+ problem. (Andrey)
-  . Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE). 
-	(vanviegen)
-
- PCRE:
-  . Fixed bug #73612 (preg_*() may leak memory). (cmb)
-
- PDO_Firebird:
-  . Fixed bug #72931 (PDO_FIREBIRD with Firebird 3.0 not work on returning
-    statement). (Dorin Marcoci)
-
- Phar:
-  . Fixed bug #73773 (Seg fault when loading hostile phar). (Stas)
-  . Fixed bug #73768 (Memory corruption when loading hostile phar). (Stas)
-  . Fixed bug #73764 (Crash while loading hostile phar archive). (Stas)
-
- Phpdbg:
-  . Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup).
-    (Bob)
-  . Fixed issue getting executable lines from custom wrappers. (Bob)
-  . Fixed bug #73704 (phpdbg shows the wrong line in files with shebang). (Bob)
-
- Reflection:
-  . Fixed bug #46103 (ReflectionObject memory leak). (Nikita)
-
- Streams:
-  . Fixed bug #73586 (php_user_filter::$stream is not set to the stream the
-    filter is working on). (Dmitry)
-
- SQLite3:
-  . Reverted fix for bug #73530	(Unsetting result set may reset other result
-    set). (cmb)
-
- Standard:
-  . Fixed bug #73594 (dns_get_record does not populate $additional out
-    parameter). (Bruce Weirdan)
-  . Fixed bug #70213 (Unserialize context shared on double class lookup).
-    (Taoguang Chen)
-  . Fixed bug #73154 (serialize object with __sleep function crash). (Nikita)
-  . Fixed bug #70490 (get_browser function is very slow). (Nikita)
-  . Fixed bug #73265 (Loading browscap.ini at startup causes high memory usage).
-    (Nikita)
-  . Fixed bug #31875 (get_defined_functions additional param to exclude
-	disabled functions). (willianveiga)
-
- Zlib:
-  . Fixed bug #73373 (deflate_add does not verify that output was not truncated).
-    (Matt Bonneau)
-
-08 Dec 2016 PHP 7.0.14
-
- Core:
-  . Fixed memory leak(null coalescing operator with Spl hash). (Tyson Andre)
-  . Fixded bug #72736 (Slow performance when fetching large dataset with mysqli
-    / PDO). (Dmitry)
-
- Calendar:
-  . Fix integer overflows (Joshua Rogers)
-
- Date:
-  . Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
-
- DTrace:
-  . Disabled PHP call tracing by default (it makes significant overhead).
-    This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
-    (Dmitry)
-
- JSON:
-  . Fixed bug #73526 (php_json_encode depth issue). (Jakub Zelenka)
-
- Mysqlnd:
-  . Fixed bug #64526 (Add missing mysqlnd.* parameters to php.ini-*). (cmb)
-
- ODBC:
-  . Fixed bug #73448 (odbc_errormsg returns trash, always 513 bytes).
-    (Anatol)
-
- Opcache:
-  . Fixed bug #69090 (check cached files permissions). (dmitry)
-  . Fixed bug #73546 (Logging for opcache has an empty file name). (mhagstrand)
-
- PCRE:
-  . Fixed bug #73483 (Segmentation fault on pcre_replace_callback). (Laruence)
-  . Fixed bug #73392 (A use-after-free in zend allocator management). 
-    (Laruence)
-
- PDO_Firebird:
-  . Fixed bug #73087, #61183, #71494 (Memory corruption in bindParam).
-    (Dorin Marcoci)
-
- Postgres:
-  . Fixed bug #73498 (Incorrect SQL generated for pg_copy_to()). (Craig Duncan)
-
- Phar:
-  . Fixed bug #73580 (Phar::isValidPharFilename illegal memory access). (Stas)
-
- Soap:
-  . Fixed bug #73538 (SoapClient::__setSoapHeaders doesn't overwrite SOAP
-    headers). (duncan3dc)
-  . Fixed bug #73452 (Segfault (Regression for #69152)). (Dmitry)
-
- SPL:
-  . Fixed bug #73423 (Reproducible crash with GDB backtrace). (Laruence)
-
- SQLite3:
-  . Fixed bug #73530 (Unsetting result set may reset other result set). (cmb)
-
- Standard:
-  . Fixed bug #73297 (HTTP stream wrapper should ignore HTTP 100 Continue).
-    (rowan dot collins at gmail dot com)
-  . Fixed bug #73645 (version_compare illegal write access). (Stas)
-
- Wddx:
-  . Fixed bug #73631 (Invalid read when wddx decodes empty boolean element).
-  (Stas)
-
- XML:
-  . Fixed bug #72135 (malformed XML causes fault) (edgarsandi)
-
 10 Nov 2016 PHP 7.0.13

 - Core:
@@ -594,7 +61,6 @@ PHP                                                                        NEWS
  . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb)
  . Fixed bug #71241 (array_replace_recursive sometimes mutates its parameters).
    (adsr)
-  . Fixed bug #73192 (parse_url return wrong hostname). (Nikita)

 - Wddx:
  . Fixed bug #73331 (NULL Pointer Dereference in WDDX Packet Deserialization
@@ -919,8 +385,6 @@ PHP                                                                        NEWS
  . Fixed bug #68712 (suspicious if-else statements). (cmb)
  . Fixed bug #72697 (select_colors write out-of-bounds). (Stas)
  . Fixed bug #72730 (imagegammacorrect allows arbitrary write access). (Stas)
-  . Fixed bug #72494 (imagecropauto out-of-bounds access). (Fernando, Pierre,
-    cmb)

 - Intl:
  . Fixed bug #72639 (Segfault when instantiating class that extends
@@ -93,27 +93,24 @@ Commit the changes to the main branch.
 12. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
 and build three tarballs (gz, bz2 and xz).

-13. run ``scripts/dev/gen_verify_stub <version> [identity]``, this will sign the tarballs
-and output verification information to be included in announcement email
-
-14. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
+13. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
 MD5 sums. If you do not have this directory, talk to Derick or Dan.

-15. Now the RC can be found on http://downloads.php.net/yourname,
+14. Now the RC can be found on http://downloads.php.net/yourname,
 f.e. http://downloads.php.net/derick/

-16. Once the release has been tagged, contact the PHP Windows development team
+15. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once
 those are made, they should be placed into the same directory as the source snapshots.

 Getting the non stable release (alpha/beta/RC) announced
 --------------------------------------------------------

-1. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` 
-lists pointing out "the location of the release" and "the possible release date of
-either the next RC, or the final release". Include in this information the verification
-information output by ``gen_verify_stub``.
+1. Send an email (see example here: http://news.php.net/php.internals/19486)
+**To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` lists
+pointing out "the location of the release" and "the possible release date of
+either the next RC, or the final release".

 2. Send an email (see example here http://news.php.net/php.pear.qa/5201) **To**
 ``php-qa@lists.php.net`` and ``primary-qa-tester@lists.php.net``.
@@ -193,8 +190,8 @@ Check if the pear files are updated (phar).
 This is to fetch the last commit id from php-distributions.git and commit this
 last commit id to web/php.git, then, mirrors will now sync

-12. Once the release has been tagged, contact release managers, windows builders, and package maintainers
-so that they can build releases. Do not send this announcement to any public lists.
+12. Once the release has been tagged, contact the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created.

 Getting the stable release announced
 ------------------------------------
@@ -5,7 +5,6 @@ This is the github mirror of the official PHP repository located at
 http://git.php.net.

 [![Build Status](https://secure.travis-ci.org/php/php-src.svg?branch=master)](http://travis-ci.org/php/php-src)
-[![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy?svg=true)](https://ci.appveyor.com/project/php/php-src)

 Pull Requests
 =============
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2016 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-2017 The PHP Group                                |
+   | Copyright (c) 1997-2016 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-2017 The PHP Group                                |
+   | Copyright (c) 1997-2016 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        |
@@ -671,6 +671,7 @@ TSRM_API int shmget(int key, int size, int flags)
 TSRM_API void *shmat(int key, const void *shmaddr, int flags)
 {
 	shm_pair *shm = shm_get(key, NULL);
+	int err;

 	if (!shm->segment) {
 		return (void*)-1;
@@ -678,8 +679,8 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)

 	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);

-	if (NULL == shm->addr) {
-		int err = GetLastError();
+	err = GetLastError();
+	if (err) {
 		/* Catch more errors */
 		if (ERROR_NOT_ENOUGH_MEMORY == err) {
 			_set_errno(ENOMEM);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2016 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        |
@@ -484,7 +484,6 @@ Other
    is defined in the interface.
  . session.lazy_write(default=On) INI setting enables only write session data when
    session data is updated.
-  . session_regenerate_id() saves current $_SESSION before creating new session ID.

 - Opcache
  . Removed opcache.load_comments configuration directive. Now doc comments
@@ -652,11 +651,6 @@ Other
  Since 7.0.9, getenv() has optional second parameter, making it only
  consider local environment and not SAPI environment if true.

- fopen()
-  Since 7.0.16, mode 'e' was added, which sets the close-on-exec flag
-  on the opened file descriptor. This mode is only available in PHP compiled on
-  POSIX.1-2008 conform systems.
-
 ========================================
 6. New Functions
 ========================================
@@ -727,13 +721,6 @@ out, that the corresponding SDK isn't available anymore.
  Mhash is not an extension anymore, use function_exists("mhash") to check whether
  it is avaliable.

- PDO_Firebird
-  As of PHP 7.0.16, the fetched data for integer fields is aware of the Firebird
-  datatypes. Previously all integers was fetched as strings, starting with the
-  aforementioned PHP version integer fields are translated to the PHP integer
-  datatype. The 64-bit integers are still fetched as strings in 32-bit PHP
-  builds.
-
 - GD
  The bundled libgd requires libwebp instead of libvpx for the WebP functionality.

@@ -800,7 +787,6 @@ out, that the corresponding SDK isn't available anymore.
  . Removed asp_tags ini directive. Trying to enable it will result in a fatal
    error.
  . Removed always_populate_raw_post_data ini directive.
-  . realpath_cache_size set to 4096k by default

 ========================================
 12. Windows Support
@@ -100,7 +100,7 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp)
 AC_ZEND_BROKEN_SPRINTF

-AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]])
+AC_CHECK_FUNCS(finite isfinite isinf isnan)

 ZEND_FP_EXCEPT

@@ -64,33 +64,33 @@ int zend_sprintf(char *buffer, const char *format, ...);

 /* To enable the is_nan, is_infinite and is_finite PHP functions */
 #ifdef NETWARE
-	#define HAVE_DECL_ISNAN 1
-	#define HAVE_DECL_ISINF 1
-	#define HAVE_DECL_ISFINITE 1
+	#define HAVE_ISNAN 1
+	#define HAVE_ISINF 1
+	#define HAVE_ISFINITE 1
 #endif

 #ifndef zend_isnan
-#if HAVE_DECL_ISNAN
+#ifdef HAVE_ISNAN
 #define zend_isnan(a) isnan(a)
 #elif defined(HAVE_FPCLASS)
 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
 #else
-#define zend_isnan(a) ((a) != (a))
+#define zend_isnan(a) 0
 #endif
 #endif

-#if HAVE_DECL_ISINF
+#ifdef HAVE_ISINF
 #define zend_isinf(a) isinf(a)
 #elif defined(INFINITY)
 /* Might not work, but is required by ISO C99 */
-#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0)
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
 #elif defined(HAVE_FPCLASS)
 #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
 #else
 #define zend_isinf(a) 0
 #endif

-#if HAVE_DECL_ISFINITE
+#if defined(HAVE_ISFINITE) || defined(isfinite)
 #define zend_finite(a) isfinite(a)
 #elif defined(HAVE_FINITE)
 #define zend_finite(a) finite(a)
@@ -26,6 +26,7 @@ var_dump(count(get_defined_constants()));
 function test () {
 }

+var_dump(get_defined_functions(true));
 var_dump(gettype(get_defined_functions()));
 var_dump(count(get_defined_functions()));

@@ -64,6 +65,9 @@ NULL
 string(5) "array"
 string(5) "array"
 int(%d)
+
+Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
 string(5) "array"
 int(%d)

@@ -1,12 +0,0 @@
--TEST--
-Assign to $this leaks when $this not defined
--FILE--
-<?php
-
-try {
-	$this->a = new stdClass;
-} catch (Error $e) { echo $e->getMessage(), "\n"; }
-
-?>
--EXPECT--
-Using $this when not in object context
@@ -1,11 +0,0 @@
--TEST--
-ZEND_POW_ASSIGN
--INI--
-zend.assertions=1
--FILE--
-<?php
-
-assert_options(ASSERT_WARNING);
-assert(false && ($a **= 2));
--EXPECTF--
-Warning: assert(): assert(false && ($a **= 2)) failed in %s%ezend-pow-assign.php on line %d
@@ -79,7 +79,7 @@ Stack trace:
 #0 %sbug72101.php(8): {closure}(2, 'Parameter 1 to ...', '%s', 8, Array)
 #1 %sbug72101.php(27): PHPUnit_Framework_MockObject_Stub_ReturnCallback->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))
 #2 %sbug72101.php(19): PHPUnit_Framework_MockObject_Matcher->invoked(Object(PHPUnit_Framework_MockObject_Invocation_Static))
-#3 %sbug72101.php(52): PHPUnit_Framework_MockObject_InvocationMocker->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))
+#3 %sbug72101.php(51): PHPUnit_Framework_MockObject_InvocationMocker->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))
 #4 %sbug72101.php(72): Mock_MethodCallbackByReference_7b180d26->bar(0, 0, 0)
 #5 {main}
  thrown in %sbug72101.php on line 61
@@ -1,73 +0,0 @@
--TEST--
-Bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
--FILE--
-<?php
-function change(&$ref) {
-	$ref = range(1, 10);
-	return;
-}
-
-$func = function (&$ref) {
-	return change($ref);
-};
-
-$array = [1];
-var_dump(list($val) = $array); // NG: Invalid opcode
-
-change(list($val) = $array);
-var_dump($array);
-
-$array = [1];
-
-$func(list($val) = $array);
-var_dump($array);
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
@@ -1,29 +0,0 @@
--TEST--
-Bug #73753 Non packed arrays and duplication
--FILE--
-<?php
-function iterate($current, $a, $result = null) {
-    if (!$current) {
-        return $result;
-    }
-
-    return iterate(getNext($a), $a, $current);
-}
-
-function getNext(&$a) {
-    return next($a);
-}
-
-function getCurrent($a) {
-    return current($a);
-}
-
-function traverse($a) {
-    return iterate(getCurrent($a), $a);
-}
-
-$arr = array(1 => 'foo', 'b' => 'bar', 'baz');
-var_dump(traverse($arr));
-?>
--EXPECTF--
-string(3) "baz"
@@ -1,20 +0,0 @@
--TEST--
-Bug #73792 (invalid foreach loop hangs script)
--FILE--
-<?php
-$a = 'aaa';
-
-foreach ($a['bbb'] as &$value) {
-	echo 'loop';
-}
-
-unset($value);
-echo 'done';
-?>
--EXPECTF--
-Warning: Illegal string offset 'bbb' in %sbug73792.php on line 4
-
-Fatal error: Uncaught Error: Cannot iterate on string offsets by reference in %sbug73792.php:4
-Stack trace:
-#0 {main}
-  thrown in %sbug73792.php on line 4
@@ -1,16 +0,0 @@
--TEST--
-Bug #73916 (zend_print_flat_zval_r doesn't consider reference)
--FILE--
-<?php
-$a = array('a');
-class b{};
-$b = new b;
-$test[] =& $a;
-$test[] =& $b;
-test($test);
-function test() {
-	debug_print_backtrace();
-}
-?>
--EXPECTF--
-#0  test(Array ([0] => Array ([0] => a),[1] => b Object ())) called at [%sbug73916.php:%d]
@@ -1,23 +0,0 @@
--TEST--
-Bug #73954 (NAN check fails on Alpine Linux with musl)
--FILE--
-<?php
-
-var_dump(NAN);
-var_dump(is_nan(NAN));
-
-function takes_int(int $int) {
-}
-
-takes_int(log(tan(3.14)));
-
-?>
--EXPECTF--
-float(NAN)
-bool(true)
-
-Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type integer, float given, called in %s on line 9 and defined in %s:6
-Stack trace:
-#0 %s(9): takes_int(NAN)
-#1 {main}
-  thrown in %s on line 6
@@ -1,16 +0,0 @@
--TEST--
-Bug #73960: Leak with instance method calling static method with referenced return
--FILE--
-<?php
-
-$value = 'one';
-$array = array($value);
-$array = $ref =& $array;
-var_dump($array);
-
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  string(3) "one"
-}
@@ -1,28 +0,0 @@
--TEST--
-Bug #73989 (PHP 7.1 Segfaults within Symfony test suite)
--FILE--
-<?php
-class Cycle
-{
-    private $thing;
-
-    public function __construct()
-    {
-		$obj = $this;
-        $this->thing = function() use($obj) {};
-    }
-
-    public function __destruct()
-    {
-		($this->thing)();
-    }
-
-}
-
-for ($i = 0; $i < 10000; ++$i) {
-    $obj = new Cycle();
-}
-echo "OK\n";
-?>
--EXPECT--
-OK
@@ -1,19 +0,0 @@
--TEST--
-Bug #73998 (array_key_exists fails on arrays created by get_object_vars)
--DESCRIPTION--
-Properties of objects with numeric names should be accessible
--FILE--
-<?php
-$a = new stdClass;
-$a->{1234} = "Numeric";
-$a->a1234 = "String";
-
-$properties = get_object_vars($a);
-var_dump(array_key_exists(1234, $properties));
-echo "Value: {$properties[1234]}\n";
-
-?>
--EXPECT--
-bool(true)
-Value: Numeric
-
@@ -1,19 +0,0 @@
--TEST--
-Bug #74084 (Out of bound read - zend_mm_alloc_small)
--INI--
-error_reporting=0
--FILE--
-<?php
-$$A += $$B->a = &$$C; 
-unset($$A);
-$$A -= $$B->a = &$$C; 
-unset($$A);
-$$A *= $$B->a = &$$C; 
-unset($$A);
-$$A /= $$B->a = &$$C; 
-unset($$A);
-$$A **= $$B->a = &$$C; 
-var_dump($$A);
-?>
--EXPECT--
-int(1)
@@ -1,14 +0,0 @@
--TEST--
-Fixes bug 74188 (undeclared static variables emit a warning with ?? operator)
--FILE--
-<?php
-abstract class Test
-{
-	public static function get()
-	{
-		static::$a ?? true;
-	}
-}
-Test::get();
-?>
--EXPECT--
@@ -1,38 +0,0 @@
--TEST--
-Bug #74408 (Endless loop bypassing execution time limit)
--INI--
-error_reporting = E_ALL | E_DEPRECATED | E_STRICT
--FILE--
-<?php
-
- //php.ini: error_reporting = E_ALL | E_DEPRECATED | E_STRICT
-
- class ErrorHandling {
-
-  public  function error_handler($errno, $errstr, $errfile, $errline) {
-	  $bla = new NonExistingClass2();
-  }
-
-  public function exception_handler(Error $e) { 
-	  echo "Caught, exception: " . $e->getMessage();
-  }
- }
-
- set_error_handler('ErrorHandling::error_handler');
- set_exception_handler('ErrorHandling::exception_handler');
-
- $blubb = new NonExistingClass();
-?>
--EXPECTF--
-Deprecated: Non-static method ErrorHandling::error_handler() should not be called statically in %sbug74408.php on line %d
-
-Deprecated: Non-static method ErrorHandling::error_handler() should not be called statically in %sbug74408.php on line %d
-
-Deprecated: Non-static method ErrorHandling::error_handler() should not be called statically in Unknown on line 0
-
-Fatal error: Uncaught Error: Class 'NonExistingClass2' not found in %sbug74408.php:%d
-Stack trace:
-#0 [internal function]: ErrorHandling::error_handler(8192, 'Non-static meth...', '%s', %d, Array)
-#1 %sbug74408.php(%d): set_exception_handler('ErrorHandling::...')
-#2 {main}
-  thrown in %sbug74408.php on line %d
@@ -1,11 +0,0 @@
--TEST--
-Bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())
--FILE--
-<?php 
-"000000"[0]::d;
-?>
--EXPECTF--
-Fatal error: Uncaught Error: Class '0' not found in %sbug74546.php:%d
-Stack trace:
-#0 {main}
-  thrown in %sbug74546.php on line %d
@@ -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,184 +0,0 @@
--TEST--
-Behavior of failing compound assignment
--INI--
-opcache.optimization_level=0
--FILE--
-<?php
-
-try {
-	$a = 1;
-	$a %= 0;
-} catch (Error $e) { var_dump($a); }
-
-try {
-	$a = 1;
-	$a >>= -1;
-} catch (Error $e) { var_dump($a); }
-
-try {
-	$a = 1;
-	$a <<= -1;
-} catch (Error $e) { var_dump($a); }
-
-set_error_handler(function($type, $msg) { throw new Exception($msg); });
-
-try {
-	$a = [];
-	$a .= "foo";
-} catch (Throwable $e) { var_dump($a); }
-
-try {
-	$a = "foo";
-	$a .= [];
-} catch (Throwable $e) { var_dump($a); }
-
-$x = new stdClass;
-try { $x += 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x += new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x -= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x -= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x *= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x *= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x /= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x /= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x %= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x %= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x **= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x **= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x ^= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x ^= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x &= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x &= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x |= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x |= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x <<= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x <<= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = new stdClass;
-try { $x >>= 1; }
-catch (Exception $e) {}
-var_dump($x);
-
-$x = 1;
-try { $x >>= new stdClass; }
-catch (Exception $e) {}
-var_dump($x);
-?>
--EXPECTF--
-int(1)
-int(1)
-int(1)
-array(0) {
-}
-string(3) "foo"
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
-object(stdClass)#%d (0) {
-}
-int(1)
@@ -2,37 +2,51 @@
 Concatenating many small strings should not slowdown allocations
 --SKIPIF--
 <?php if (PHP_DEBUG) { die ("skip debug version is slow"); } ?>
+--INI--
+memory_limit=256m
 --FILE--
 <?php

+/* To note is that memory usage can vary depending on whether opcache is on. The actual
+  measuring that matters is timing here. */
+
 $time = microtime(TRUE);

 /* This might vary on Linux/Windows, so the worst case and also count in slow machines. */
-$t_max = 1.0;
+$t0_max = 0.1;
+$t1_max = 0.4;
+
+$datas = [];
+for ($i = 0; $i < 220000; $i++)
+{
+    $datas[] = [
+        '000.000.000.000',
+        '000.255.255.255',
+        '保留地址',
+        '保留地址',
+        '保留地址',
+        '保留地址',
+        '保留地址',
+        '保留地址',
+    ];
+}
+
+$t0 = microtime(TRUE) - $time;
+var_dump($t0 < $t0_max);

-$datas = array_fill(0, 220000, [
-    '000.000.000.000',
-    '000.255.255.255',
-    '保留地址',
-    '保留地址',
-    '保留地址',
-    '保留地址',
-    '保留地址',
-    '保留地址',
-]);

-$time = microtime(TRUE);
 $texts = '';
 foreach ($datas AS $data)
 {
    $texts .= implode("\t", $data) . "\r\n";
 }

-$t = microtime(TRUE) - $time;
-var_dump($t < $t_max);
+$t1 = microtime(TRUE) - $time;
+var_dump($t1 < $t1_max);

 ?>
 +++DONE+++
 --EXPECT--
 bool(true)
+bool(true)
 +++DONE+++
@@ -1,7 +1,5 @@
 --TEST--
 Testing __debugInfo() magic method with bad returns RESOURCE
--INI--
-allow_url_fopen=1
 --FILE--
 <?php

@@ -1,10 +0,0 @@
--TEST--
-Use of non-literals in declare ticks values crashes compiler
--FILE--
-<?php
-declare(ticks = UNKNOWN_CONST) {
-  echo 'Done';
-}
--EXPECTF--
-
-Fatal error: declare(ticks) value must be a literal in %sdeclare_006.php on line 2
@@ -1,24 +0,0 @@
--TEST--
-Calling generator through magic __call()
--FILE--
-<?php
-class A {
-    public function __call($name, $args) {
-        for ($i = 0; $i < 5; $i++) {
-            yield $i;
-        }
-    }
-}
-
-$a = new A();
-foreach ($a->gen() as $n) {
-    var_dump($n);
-}
-$a->gen();
-?>
--EXPECT--
-int(0)
-int(1)
-int(2)
-int(3)
-int(4)
@@ -1,24 +0,0 @@
--TEST--
-yield from parses too greedily
--FILE--
-<?php
-
-function from1234($x) {
-  return $x;
-}
-
-function bar() {
-  yield 24;
-}
-
-function foo() {
-  yield from1234(42);
-  yield from(bar());
-}
-
-foreach (foo() as $value) {
-  var_dump($value);
-}
--EXPECT--
-int(42)
-int(24)
@@ -3,7 +3,7 @@ Test get_defined_functions() function : error conditions
 --FILE--
 <?php

-/* Prototype  : array get_defined_functions  ( $exclude_disabled = false )
+/* Prototype  : array get_defined_functions  ( void  )
 * Description: Gets an array of all defined functions.
 * Source code: Zend/zend_builtin_functions.c
 */
@@ -14,8 +14,7 @@ echo "*** Testing get_defined_functions() : error conditions ***\n";

 echo "\n-- Testing get_defined_functions() function with more than expected no. of arguments --\n";
 $extra_arg = 10;
-$extra_arg2 = 20;
-var_dump( get_defined_functions($extra_arg, $extra_arg2) );
+var_dump( get_defined_functions($extra_arg) );

 ?> 
 ===Done===
@@ -24,7 +23,7 @@ var_dump( get_defined_functions($extra_arg, $extra_arg2) );

 -- Testing get_defined_functions() function with more than expected no. of arguments --

-Warning: get_defined_functions() expects at most 1 parameter, 2 given in %s on line %d
+Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
 ===Done===
@@ -6,8 +6,6 @@ ANDing strings
 $s = "123";
 $s1 = "test";
 $s2 = "45345some";
-$s3 = str_repeat("f", 1);
-$s4 = str_repeat("f", 2);

 $s &= 22;
 var_dump($s);
@@ -18,18 +16,10 @@ var_dump($s1);
 $s2 &= 33;
 var_dump($s2);

-$s3 &= " ";
-var_dump($s3);
-
-$s4 &= "  ";
-var_dump($s4);
-
 echo "Done\n";
 ?>
 --EXPECTF--	
 int(18)
 int(0)
 int(33)
-string(1) " "
-string(2) "  "
 Done
@@ -6,8 +6,6 @@ ORing strings
 $s = "123";
 $s1 = "test";
 $s2 = "45345some";
-$s3 = str_repeat("f", 1);
-$s4 = str_repeat("f", 2);

 $s |= 22;
 var_dump($s);
@@ -18,18 +16,10 @@ var_dump($s1);
 $s2 |= 33;
 var_dump($s2);

-$s3 |= " ";
-var_dump($s3);
-
-$s4 |= "  ";
-var_dump($s4);
-
 echo "Done\n";
 ?>
 --EXPECTF--
 int(127)
 int(11)
 int(45345)
-string(1) "f"
-string(2) "ff"
 Done
@@ -6,8 +6,6 @@ XORing strings
 $s = "123";
 $s1 = "test";
 $s2 = "45345some";
-$s3 = str_repeat("f", 1);
-$s4 = str_repeat("f", 2);

 $s ^= 22;
 var_dump($s);
@@ -18,18 +16,10 @@ var_dump($s1);
 $s2 ^= 33;
 var_dump($s2);

-$s3 ^= " ";
-var_dump($s3);
-
-$s4 ^= "  ";
-var_dump($s4);
-
 echo "Done\n";
 ?>
 --EXPECTF--
 int(109)
 int(11)
 int(45312)
-string(1) "F"
-string(2) "FF"
 Done
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -152,12 +152,11 @@ ZEND_TSRMLS_CACHE_DEFINE()
 #endif

 ZEND_API zend_utility_values zend_uv;
-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-2017 Zend Technologies\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2016 Zend Technologies\n"
 #define PRINT_ZVAL_INDENT 4

 static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, zend_bool is_object) /* {{{ */
@@ -313,9 +312,6 @@ ZEND_API void zend_print_flat_zval_r(zval *expr) /* {{{ */
 			ZEND_PUTS(")");
 			break;
 		}
-		case IS_REFERENCE:
-			zend_print_flat_zval_r(Z_REFVAL_P(expr));
-			break;
 		default:
 			zend_print_variable(expr);
 			break;
@@ -567,7 +563,6 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
 #ifdef ZEND_WIN32
 	zend_get_windows_version_info(&executor_globals->windows_version_info);
 #endif
-	executor_globals->valid_symbol_table = 0;
 }
 /* }}} */

@@ -683,20 +678,9 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /

 #if HAVE_DTRACE
 /* build with dtrace support */
-	{
-		char *tmp = getenv("USE_ZEND_DTRACE");
-
-		if (tmp && zend_atoi(tmp, 0)) {
-			zend_dtrace_enabled = 1;
-			zend_compile_file = dtrace_compile_file;
-			zend_execute_ex = dtrace_execute_ex;
-			zend_execute_internal = dtrace_execute_internal;
-		} else {
-			zend_compile_file = compile_file;
-			zend_execute_ex = execute_ex;
-			zend_execute_internal = NULL;
-		}
-	}
+	zend_compile_file = dtrace_compile_file;
+	zend_execute_ex = dtrace_execute_ex;
+	zend_execute_internal = dtrace_execute_internal;
 #else
 	zend_compile_file = compile_file;
 	zend_execute_ex = execute_ex;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -299,8 +299,6 @@ 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;
 END_EXTERN_C()

 #define ZEND_UV(name) (zend_uv.name)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -1087,6 +1087,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;
@@ -1160,9 +1162,7 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */

 			*scope = old_scope;
 		}
-		class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
 	}
-
 	return SUCCESS;
 }
 /* }}} */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -897,7 +897,6 @@ static void *zend_mm_alloc_pages(zend_mm_heap *heap, int pages_count ZEND_FILE_L
 {
 	zend_mm_chunk *chunk = heap->main_chunk;
 	int page_num, len;
-	int steps = 0;

 	while (1) {
 		if (UNEXPECTED(chunk->free_pages < pages_count)) {
@@ -1074,20 +1073,10 @@ get_chunk:
 			goto found;
 		} else {
 			chunk = chunk->next;
-			steps++;
 		}
 	}

 found:
-	if (steps > 2 && pages_count < 8) {
-		/* move chunk into the head of the linked-list */
-		chunk->prev->next = chunk->next;
-		chunk->next->prev = chunk->prev;
-		chunk->next = heap->main_chunk->next;
-		chunk->prev = heap->main_chunk;
-		chunk->prev->next = chunk;
-		chunk->next->prev = chunk;
-	}
 	/* mark run as allocated */
 	chunk->free_pages -= pages_count;
 	zend_mm_bitset_set_range(chunk->free_map, page_num, pages_count);
@@ -2343,7 +2332,7 @@ ZEND_API int is_zend_mm(void)
 #endif
 }

-#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)
+#if !ZEND_DEBUG && (!defined(_WIN32) || defined(__clang__))
 #undef _emalloc

 #if ZEND_MM_CUSTOM
@@ -2862,7 +2851,7 @@ static ZEND_COLD ZEND_NORETURN void zend_out_of_memory(void)
 ZEND_API void * __zend_malloc(size_t len)
 {
 	void *tmp = malloc(len);
-	if (EXPECTED(tmp || !len)) {
+	if (EXPECTED(tmp)) {
 		return tmp;
 	}
 	zend_out_of_memory();
@@ -2878,7 +2867,7 @@ ZEND_API void * __zend_calloc(size_t nmemb, size_t len)
 ZEND_API void * __zend_realloc(void *p, size_t len)
 {
 	p = realloc(p, len);
-	if (EXPECTED(p || !len)) {
+	if (EXPECTED(p)) {
 		return p;
 	}
 	zend_out_of_memory();
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -57,21 +57,17 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) {
 	return (zend_ast *) ast;
 }

-ZEND_API zend_ast *zend_ast_create_zval_with_lineno(zval *zv, zend_ast_attr attr, uint32_t lineno) {
+ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) {
 	zend_ast_zval *ast;

 	ast = zend_ast_alloc(sizeof(zend_ast_zval));
 	ast->kind = ZEND_AST_ZVAL;
 	ast->attr = attr;
 	ZVAL_COPY_VALUE(&ast->val, zv);
-	ast->val.u2.lineno = lineno;
+	ast->val.u2.lineno = CG(zend_lineno);
 	return (zend_ast *) ast;
 }

-ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) {
-	return zend_ast_create_zval_with_lineno(zv, attr, CG(zend_lineno));
-}
-
 ZEND_API zend_ast *zend_ast_create_decl(
 	zend_ast_kind kind, uint32_t flags, uint32_t start_lineno, zend_string *doc_comment,
 	zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2, zend_ast *child3
@@ -159,14 +155,7 @@ ZEND_API zend_ast *zend_ast_create_list(uint32_t init_children, zend_ast_kind ki
 		uint32_t i;
 		va_start(va, kind);
 		for (i = 0; i < init_children; ++i) {
-			zend_ast *child = va_arg(va, zend_ast *);
-			ast = zend_ast_list_add(ast, child);
-			if (child != NULL) {
-				uint32_t lineno = zend_ast_get_lineno(child);
-				if (lineno < ast->lineno) {
-					ast->lineno = lineno;
-				}
-			}
+			ast = zend_ast_list_add(ast, va_arg(va, zend_ast *));
 		}
 		va_end(va);
 	}
@@ -1355,7 +1344,7 @@ simple_list:
 				case ZEND_ASSIGN_BW_OR:  BINARY_OP(" |= ",  90, 91, 90);
 				case ZEND_ASSIGN_BW_AND: BINARY_OP(" &= ",  90, 91, 90);
 				case ZEND_ASSIGN_BW_XOR: BINARY_OP(" ^= ",  90, 91, 90);
-				case ZEND_ASSIGN_POW:    BINARY_OP(" **= ", 90, 91, 90);
+				case ZEND_POW:           BINARY_OP(" **= ", 90, 91, 90);
 				EMPTY_SWITCH_DEFAULT_CASE();
 			}
 			break;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -190,7 +190,6 @@ typedef struct _zend_ast_decl {
 typedef void (*zend_ast_process_t)(zend_ast *ast);
 extern ZEND_API zend_ast_process_t zend_ast_process;

-ZEND_API zend_ast *zend_ast_create_zval_with_lineno(zval *zv, zend_ast_attr attr, uint32_t lineno);
 ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr);

 ZEND_API zend_ast *zend_ast_create_ex(zend_ast_kind kind, zend_ast_attr attr, ...);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -808,6 +808,9 @@ static void copy_constant_array(zval *dst, zval *src) /* {{{ */
 			}
 		} else if (Z_REFCOUNTED_P(val)) {
 			Z_ADDREF_P(val);
+			if (UNEXPECTED(Z_TYPE_INFO_P(val) == IS_RESOURCE_EX)) {
+				Z_TYPE_INFO_P(new_val) &= ~(IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT);
+			}
 		}
 	} ZEND_HASH_FOREACH_END();
 }
@@ -850,7 +853,12 @@ repeat:
 		case IS_FALSE:
 		case IS_TRUE:
 		case IS_NULL:
+			break;
 		case IS_RESOURCE:
+			ZVAL_COPY(&val_free, val);
+			/* TODO: better solution than this tricky disable dtor on resource? */
+			Z_TYPE_INFO(val_free) &= ~(IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT);
+			val = &val_free;
 			break;
 		case IS_ARRAY:
 			if (!Z_IMMUTABLE_P(val)) {
@@ -1146,8 +1154,6 @@ ZEND_FUNCTION(get_object_vars)
 	HashTable *properties;
 	zend_string *key;
 	zend_object *zobj;
-	zend_ulong index;
-	zend_bool fast_copy = 0;

 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(obj)
@@ -1166,17 +1172,7 @@ ZEND_FUNCTION(get_object_vars)
 	zobj = Z_OBJ_P(obj);

 	if (!zobj->ce->default_properties_count && properties == zobj->properties && !ZEND_HASH_GET_APPLY_COUNT(properties)) {
-		fast_copy = 1;
-		/* Check if the object has a numeric property, See Bug 73998 */
-		ZEND_HASH_FOREACH_STR_KEY(properties, key) {
-			if (key && ZEND_HANDLE_NUMERIC(key, index)) {
-				fast_copy = 0;
-				break;
-			}
-		} ZEND_HASH_FOREACH_END();
-	}
-
-	if (fast_copy) {
+		/* fast copy */
 		if (EXPECTED(zobj->handlers == &std_object_handlers)) {
 			if (EXPECTED(!(GC_FLAGS(properties) & IS_ARRAY_IMMUTABLE))) {
 				GC_REFCOUNT(properties)++;
@@ -1202,7 +1198,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_symbtable_add_new(Z_ARRVAL_P(return_value), key, value);
+						zend_hash_add_new(Z_ARRVAL_P(return_value), key, value);
 					}
 				}
 			}
@@ -1872,22 +1868,13 @@ static int copy_function_name(zval *zv, int num_args, va_list args, zend_hash_ke
 	zend_function *func = Z_PTR_P(zv);
 	zval *internal_ar = va_arg(args, zval *),
 	     *user_ar     = va_arg(args, zval *);
-	zend_bool *exclude_disabled = va_arg(args, zend_bool *);

 	if (hash_key->key == NULL || ZSTR_VAL(hash_key->key)[0] == 0) {
 		return 0;
 	}

 	if (func->type == ZEND_INTERNAL_FUNCTION) {
-		char *disable_functions = INI_STR("disable_functions");
-
-		if ((*exclude_disabled == 1) && (disable_functions != NULL)) {
-			if (strstr(disable_functions, func->common.function_name->val) == NULL) {
-				add_next_index_str(internal_ar, zend_string_copy(hash_key->key));
-			}
-		} else {
-			add_next_index_str(internal_ar, zend_string_copy(hash_key->key));
-		}
+		add_next_index_str(internal_ar, zend_string_copy(hash_key->key));
 	} else if (func->type == ZEND_USER_FUNCTION) {
 		add_next_index_str(user_ar, zend_string_copy(hash_key->key));
 	}
@@ -1901,9 +1888,8 @@ static int copy_function_name(zval *zv, int num_args, va_list args, zend_hash_ke
 ZEND_FUNCTION(get_defined_functions)
 {
 	zval internal, user;
-	zend_bool exclude_disabled = 0;

-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &exclude_disabled) == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}

@@ -1911,7 +1897,7 @@ ZEND_FUNCTION(get_defined_functions)
 	array_init(&user);
 	array_init(return_value);

-	zend_hash_apply_with_arguments(EG(function_table), copy_function_name, 3, &internal, &user, &exclude_disabled);
+	zend_hash_apply_with_arguments(EG(function_table), copy_function_name, 2, &internal, &user);

 	zend_hash_str_add_new(Z_ARRVAL_P(return_value), "internal", sizeof("internal")-1, &internal);
 	zend_hash_str_add_new(Z_ARRVAL_P(return_value), "user", sizeof("user")-1, &user);
@@ -2368,19 +2354,13 @@ ZEND_FUNCTION(debug_print_backtrace)
 		object = Z_OBJ(call->This);

 		if (call->func) {
-			zend_string *zend_function_name;
-
 			func = call->func;
-            if (func->common.scope && func->common.scope->trait_aliases) {
-                zend_function_name = zend_resolve_method_name(object ? object->ce : func->common.scope, func);
-            } else {
-                zend_function_name = func->common.function_name;
-            }
-            if (zend_function_name != NULL) {
-                function_name = ZSTR_VAL(zend_function_name);
-            } else {
-                function_name = NULL;
-            }
+			function_name = (func->common.scope &&
+			                 func->common.scope->trait_aliases) ?
+				ZSTR_VAL(zend_resolve_method_name(
+					(object ? object->ce : func->common.scope), func)) :
+				(func->common.function_name ?
+					ZSTR_VAL(func->common.function_name) : NULL);
 		} else {
 			func = NULL;
 			function_name = NULL;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -1002,8 +1002,10 @@ ZEND_API zend_class_entry *do_bind_class(const zend_op_array* op_array, const ze
 		op1 = RT_CONSTANT(op_array, opline->op1);
 		op2 = RT_CONSTANT(op_array, opline->op2);
 	}
-	ce = zend_hash_find_ptr(class_table, Z_STR_P(op1));
-	ZEND_ASSERT(ce);
+	if ((ce = zend_hash_find_ptr(class_table, Z_STR_P(op1))) == NULL) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Internal Zend error - Missing class information for %s", Z_STRVAL_P(op1));
+		return NULL;
+	}
 	ce->refcount++;
 	if (zend_hash_add_ptr(class_table, Z_STR_P(op2), ce) == NULL) {
 		ce->refcount--;
@@ -1574,7 +1576,6 @@ int zendlex(zend_parser_stack_elem *elem) /* {{{ */
 {
 	zval zv;
 	int retval;
-	uint32_t start_lineno;

 	if (CG(increment_lineno)) {
 		CG(zend_lineno)++;
@@ -1583,7 +1584,6 @@ int zendlex(zend_parser_stack_elem *elem) /* {{{ */

 again:
 	ZVAL_UNDEF(&zv);
-	start_lineno = CG(zend_lineno);
 	retval = lex_scan(&zv);
 	if (EG(exception)) {
 		return T_ERROR;
@@ -1607,7 +1607,7 @@ again:
 			break;
 	}
 	if (Z_TYPE(zv) != IS_UNDEF) {
-		elem->ast = zend_ast_create_zval_with_lineno(&zv, 0, start_lineno);
+		elem->ast = zend_ast_create_zval(&zv);
 	}

 	return retval;
@@ -2783,21 +2783,12 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */
 			}
 		} else {
 			zend_compile_expr(&arg_node, arg);
+			ZEND_ASSERT(arg_node.op_type != IS_CV);
 			if (arg_node.op_type == IS_VAR) {
 				opcode = ZEND_SEND_VAR_NO_REF;
 				if (fbc && ARG_MUST_BE_SENT_BY_REF(fbc, arg_num)) {
 					flags |= ZEND_ARG_SEND_BY_REF;
 				}
-			} else if (arg_node.op_type == IS_CV) {
-				if (fbc) {
-					if (ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) {
-						opcode = ZEND_SEND_REF;
-					} else {
-						opcode = ZEND_SEND_VAR;
-					}
-				} else {
-					opcode = ZEND_SEND_VAR_EX;
-				}
 			} else {
 				if (fbc) {
 					opcode = ZEND_SEND_VAL;
@@ -4368,12 +4359,8 @@ void zend_compile_declare(zend_ast *ast) /* {{{ */
 		zend_ast *declare_ast = declares->child[i];
 		zend_ast *name_ast = declare_ast->child[0];
 		zend_ast *value_ast = declare_ast->child[1];
+
 		zend_string *name = zend_ast_get_str(name_ast);
-
-		if (value_ast->kind != ZEND_AST_ZVAL) {
-			zend_error_noreturn(E_COMPILE_ERROR, "declare(%s) value must be a literal", ZSTR_VAL(name));
-		}
-
 		if (zend_string_equals_literal_ci(name, "ticks")) {
 			zval value_zv;
 			zend_const_expr_to_zval(&value_zv, value_ast);
@@ -6669,11 +6656,8 @@ void zend_compile_class_const(znode *result, zend_ast *ast) /* {{{ */
 		return;
 	}

-	zend_eval_const_expr(&ast->child[0]);
-	zend_eval_const_expr(&ast->child[1]);
-
-	class_ast = ast->child[0];
-	const_ast = ast->child[1];
+	zend_eval_const_expr(&class_ast);
+	zend_eval_const_expr(&const_ast);

 	if (class_ast->kind == ZEND_AST_ZVAL) {
 		resolved_name = zend_resolve_class_name_ast(class_ast);
@@ -7317,8 +7301,6 @@ void zend_compile_expr(znode *result, zend_ast *ast) /* {{{ */

 void zend_compile_var(znode *result, zend_ast *ast, uint32_t type) /* {{{ */
 {
-	CG(zend_lineno) = zend_ast_get_lineno(ast);
-
 	switch (ast->kind) {
 		case ZEND_AST_VAR:
 			zend_compile_simple_var(result, ast, type, 0);
@@ -7615,11 +7597,8 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
 				break;
 			}

-			zend_eval_const_expr(&ast->child[0]);
-			zend_eval_const_expr(&ast->child[1]);
-
-			class_ast = ast->child[0];
-			name_ast = ast->child[1];
+			zend_eval_const_expr(&class_ast);
+			zend_eval_const_expr(&name_ast);

 			if (name_ast->kind == ZEND_AST_ZVAL && zend_string_equals_literal_ci(zend_ast_get_str(name_ast), "class")) {
 				zend_error_noreturn(E_COMPILE_ERROR,
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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,9 +186,7 @@ ZEND_API void zend_clear_exception(void) /* {{{ */
 	}
 	OBJ_RELEASE(EG(exception));
 	EG(exception) = NULL;
-	if (EG(current_execute_data)) {
-		EG(current_execute_data)->opline = EG(opline_before_exception);
-	}
+	EG(current_execute_data)->opline = EG(opline_before_exception);
 #if ZEND_DEBUG
 	EG(opline_before_exception) = NULL;
 #endif
@@ -556,8 +554,8 @@ static void _build_trace_args(zval *arg, smart_str *str) /* {{{ */
 			break;
 		case IS_DOUBLE: {
 			double dval = Z_DVAL_P(arg);
-			char *s_tmp;
-			size_t l_tmp = zend_spprintf(&s_tmp, MAX_LENGTH_OF_DOUBLE + EG(precision) + 1, "%.*G", (int) EG(precision), dval);  /* SAFE */
+			char *s_tmp = emalloc(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1);
+			int l_tmp = zend_sprintf(s_tmp, "%.*G", (int) EG(precision), dval);  /* SAFE */
 			smart_str_appendl(str, s_tmp, l_tmp);
 			smart_str_appends(str, ", ");
 			efree(s_tmp);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -1412,11 +1412,11 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object,
 	zval rv;

 	if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) {
-		zval *z, *zptr, obj;
+		zval *z, obj;
 				
 		ZVAL_OBJ(&obj, Z_OBJ_P(object));
 		Z_ADDREF(obj);
-		zptr = z = Z_OBJ_HT(obj)->read_property(&obj, property, BP_VAR_R, cache_slot, &rv);
+		z = Z_OBJ_HT(obj)->read_property(&obj, property, BP_VAR_R, cache_slot, &rv);
 		if (UNEXPECTED(EG(exception))) {
 			OBJ_RELEASE(Z_OBJ(obj));
 			return;
@@ -1443,7 +1443,7 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object,
 		}
 		Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot);
 		OBJ_RELEASE(Z_OBJ(obj));
-		zval_ptr_dtor(zptr);
+		zval_ptr_dtor(z);
 	} else {
 		zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
 		if (UNEXPECTED(result)) {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -79,10 +79,6 @@ static zend_always_inline zval* zend_assign_to_variable(zval *variable_ptr, zval
 				return variable_ptr;
 			}
 			if (ZEND_CONST_COND(value_type & (IS_VAR|IS_CV), 1) && variable_ptr == value) {
-				if (value_type == IS_VAR && ref) {
-					ZEND_ASSERT(GC_REFCOUNT(ref) > 1);
-					--GC_REFCOUNT(ref);
-				}
 				return variable_ptr;
 			}
 			garbage = Z_COUNTED_P(variable_ptr);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -343,10 +343,6 @@ void shutdown_executor(void) /* {{{ */
 		zend_llist_destroy(&CG(open_files));
 	} zend_end_try();

-	zend_try {
-		clean_non_persistent_constants();
-    } zend_end_try();
-
 	zend_try {
 		zend_close_rsrc_list(&EG(regular_list));
 	} zend_end_try();
@@ -378,6 +374,10 @@ void shutdown_executor(void) /* {{{ */
 		}
 	} zend_end_try();

+	zend_try {
+		clean_non_persistent_constants();
+	} zend_end_try();
+
 	zend_try {
 #if 0&&ZEND_DEBUG
 	signal(SIGSEGV, original_sigsegv_handler);
@@ -755,15 +755,6 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) /
 			}
 			zend_error(E_DEPRECATED, "%s", error);
 			efree(error);
-			if (UNEXPECTED(EG(exception))) {
-				if (callable_name) {
-					zend_string_release(callable_name);
-				}
-				if (EG(current_execute_data) == &dummy_execute_data) {
-					EG(current_execute_data) = dummy_execute_data.prev_execute_data;
-				}
-				return FAILURE;
-			}
 		}
 		zend_string_release(callable_name);
 	}
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -25,12 +25,26 @@
 /* one (0) is reserved */
 #define GC_ROOT_BUFFER_MAX_ENTRIES 10001

+#define GC_FAKE_BUFFER_FLAG 0x80
+#define GC_TYPE_MASK        0x7f
+
 #define GC_HAS_DESTRUCTORS  (1<<0)

 #ifndef ZEND_GC_DEBUG
 # define ZEND_GC_DEBUG 0
 #endif

+#define GC_NUM_ADDITIONAL_ENTRIES \
+	((4096 - ZEND_MM_OVERHEAD - sizeof(void*) * 2) / sizeof(gc_root_buffer))
+
+typedef struct _gc_addtional_bufer gc_additional_buffer;
+
+struct _gc_addtional_bufer {
+	uint32_t              used;
+	gc_additional_buffer *next;
+	gc_root_buffer        buf[GC_NUM_ADDITIONAL_ENTRIES];
+};
+
 #ifdef ZTS
 ZEND_API int gc_globals_id;
 #else
@@ -39,6 +53,9 @@ ZEND_API zend_gc_globals gc_globals;

 ZEND_API int (*gc_collect_cycles)(void);

+#define GC_REMOVE_FROM_ROOTS(current) \
+	gc_remove_from_roots((current))
+
 #if ZEND_GC_DEBUG > 1
 # define GC_TRACE(format, ...) fprintf(stderr, format "\n", ##__VA_ARGS__);
 # define GC_TRACE_REF(ref, format, ...) \
@@ -106,12 +123,6 @@ static zend_always_inline void gc_remove_from_roots(gc_root_buffer *root)
 	GC_BENCH_DEC(root_buf_length);
 }

-static zend_always_inline void gc_remove_from_additional_roots(gc_root_buffer *root)
-{
-	root->next->prev = root->prev;
-	root->prev->next = root->next;
-}
-
 static void root_buffer_dtor(zend_gc_globals *gc_globals)
 {
 	if (gc_globals->buf) {
@@ -138,8 +149,6 @@ static void gc_globals_ctor_ex(zend_gc_globals *gc_globals)
 	gc_globals->gc_runs = 0;
 	gc_globals->collected = 0;

-	gc_globals->additional_buffer = NULL;
-
 #if GC_BENCH
 	gc_globals->root_buf_length = 0;
 	gc_globals->root_buf_peak = 0;
@@ -195,8 +204,6 @@ ZEND_API void gc_reset(void)
 		GC_G(first_unused) = NULL;
 		GC_G(last_unused) = NULL;
 	}
-
-	GC_G(additional_buffer) = NULL;
 }

 ZEND_API void gc_init(void)
@@ -269,45 +276,21 @@ ZEND_API void ZEND_FASTCALL gc_possible_root(zend_refcounted *ref)
 	GC_BENCH_PEAK(root_buf_peak, root_buf_length);
 }

-static zend_always_inline gc_root_buffer* gc_find_additional_buffer(zend_refcounted *ref)
-{
-	gc_additional_buffer *additional_buffer = GC_G(additional_buffer);
-
-	/* We have to check each additional_buffer to find which one holds the ref */
-	while (additional_buffer) {
-		uint32_t idx = GC_ADDRESS(GC_INFO(ref)) - GC_ROOT_BUFFER_MAX_ENTRIES;
-		if (idx < additional_buffer->used) {
-			gc_root_buffer *root = additional_buffer->buf + idx;
-			if (root->ref == ref) {
-				return root;
-			}
-		}
-		additional_buffer = additional_buffer->next;
-	}
-
-	ZEND_ASSERT(0);
-	return NULL;
-}
-
 ZEND_API void ZEND_FASTCALL gc_remove_from_buffer(zend_refcounted *ref)
 {
 	gc_root_buffer *root;

 	ZEND_ASSERT(GC_ADDRESS(GC_INFO(ref)));
+	ZEND_ASSERT(GC_ADDRESS(GC_INFO(ref)) < GC_ROOT_BUFFER_MAX_ENTRIES);

 	GC_BENCH_INC(zval_remove_from_buffer);

-	if (EXPECTED(GC_ADDRESS(GC_INFO(ref)) < GC_ROOT_BUFFER_MAX_ENTRIES)) {
-		root = GC_G(buf) + GC_ADDRESS(GC_INFO(ref));
-		gc_remove_from_roots(root);
-	} else {
-		root = gc_find_additional_buffer(ref);
-		gc_remove_from_additional_roots(root);
-	}
+	root = GC_G(buf) + GC_ADDRESS(GC_INFO(ref));
 	if (GC_REF_GET_COLOR(ref) != GC_BLACK) {
 		GC_TRACE_SET_COLOR(ref, GC_PURPLE);
 	}
 	GC_INFO(ref) = 0;
+	GC_REMOVE_FROM_ROOTS(root);

 	/* updete next root that is going to be freed */
 	if (GC_G(next_to_free) == root) {
@@ -658,7 +641,7 @@ static void gc_scan_roots(void)
 	}
 }

-static void gc_add_garbage(zend_refcounted *ref)
+static void gc_add_garbage(zend_refcounted *ref, gc_additional_buffer **additional_buffer)
 {
 	gc_root_buffer *buf = GC_G(unused);

@@ -681,23 +664,25 @@ static void gc_add_garbage(zend_refcounted *ref)
 #endif
 	} else {
 		/* If we don't have free slots in the buffer, allocate a new one and
-		 * set it's address above GC_ROOT_BUFFER_MAX_ENTRIES that have special
+		 * set it's address to GC_ROOT_BUFFER_MAX_ENTRIES that have special
 		 * meaning.
 		 */
-		if (!GC_G(additional_buffer) || GC_G(additional_buffer)->used == GC_NUM_ADDITIONAL_ENTRIES) {
+		if (!*additional_buffer || (*additional_buffer)->used == GC_NUM_ADDITIONAL_ENTRIES) {
 			gc_additional_buffer *new_buffer = emalloc(sizeof(gc_additional_buffer));
 			new_buffer->used = 0;
-			new_buffer->next = GC_G(additional_buffer);
-			GC_G(additional_buffer) = new_buffer;
+			new_buffer->next = *additional_buffer;
+			*additional_buffer = new_buffer;
 		}
-		buf = GC_G(additional_buffer)->buf + GC_G(additional_buffer)->used;
+		buf = (*additional_buffer)->buf + (*additional_buffer)->used;
+		(*additional_buffer)->used++;
 #if 1
 		/* optimization: color is already GC_BLACK (0) */
-		GC_INFO(ref) = GC_ROOT_BUFFER_MAX_ENTRIES + GC_G(additional_buffer)->used;
+		GC_INFO(ref) = GC_ROOT_BUFFER_MAX_ENTRIES;
 #else
-		GC_REF_SET_ADDRESS(ref, GC_ROOT_BUFFER_MAX_ENTRIES) + GC_G(additional_buffer)->used;
+		GC_REF_SET_ADDRESS(ref, GC_ROOT_BUFFER_MAX_ENTRIES);
 #endif
-		GC_G(additional_buffer)->used++;
+		/* modify type to prevent indirect destruction */
+		GC_TYPE(ref) |= GC_FAKE_BUFFER_FLAG;
 	}
 	if (buf) {
 		GC_REFCOUNT(ref)++;
@@ -709,7 +694,7 @@ static void gc_add_garbage(zend_refcounted *ref)
 	}
 }

-static int gc_collect_white(zend_refcounted *ref, uint32_t *flags)
+static int gc_collect_white(zend_refcounted *ref, uint32_t *flags, gc_additional_buffer **additional_buffer)
 {
 	int count = 0;
 	HashTable *ht;
@@ -742,7 +727,7 @@ tail_call:
 #else
 				if (!GC_ADDRESS(GC_INFO(ref))) {
 #endif
-					gc_add_garbage(ref);
+					gc_add_garbage(ref, additional_buffer);
 				}
 				if (obj->handlers->dtor_obj &&
 				    ((obj->handlers->dtor_obj != zend_objects_destroy_object) ||
@@ -766,7 +751,7 @@ tail_call:
 					if (Z_REFCOUNTED_P(zv)) {
 						ref = Z_COUNTED_P(zv);
 						GC_REFCOUNT(ref)++;
-						count += gc_collect_white(ref, flags);
+						count += gc_collect_white(ref, flags, additional_buffer);
 					/* count non-refcounted for compatibility ??? */
 					} else if (Z_TYPE_P(zv) != IS_UNDEF) {
 						count++;
@@ -788,7 +773,7 @@ tail_call:
 #else
 				if (!GC_ADDRESS(GC_INFO(ref))) {
 #endif
-				gc_add_garbage(ref);
+				gc_add_garbage(ref, additional_buffer);
 			}
 			ht = (zend_array*)ref;
 		} else if (GC_TYPE(ref) == IS_REFERENCE) {
@@ -828,7 +813,7 @@ tail_call:
 			if (Z_REFCOUNTED_P(zv)) {
 				ref = Z_COUNTED_P(zv);
 				GC_REFCOUNT(ref)++;
-				count += gc_collect_white(ref, flags);
+				count += gc_collect_white(ref, flags, additional_buffer);
 				/* count non-refcounted for compatibility ??? */
 			} else if (Z_TYPE_P(zv) != IS_UNDEF) {
 				count++;
@@ -846,7 +831,7 @@ tail_call:
 	return count;
 }

-static int gc_collect_roots(uint32_t *flags)
+static int gc_collect_roots(uint32_t *flags, gc_additional_buffer **additional_buffer)
 {
 	int count = 0;
 	gc_root_buffer *current = GC_G(roots).next;
@@ -855,12 +840,8 @@ static int gc_collect_roots(uint32_t *flags)
 	while (current != &GC_G(roots)) {
 		gc_root_buffer *next = current->next;
 		if (GC_REF_GET_COLOR(current->ref) == GC_BLACK) {
-			if (EXPECTED(GC_ADDRESS(GC_INFO(current->ref)) < GC_ROOT_BUFFER_MAX_ENTRIES)) {
-				gc_remove_from_roots(current);
-			} else {
-				gc_remove_from_additional_roots(current);
-			}
 			GC_INFO(current->ref) = 0; /* reset GC_ADDRESS() and keep GC_BLACK */
+			GC_REMOVE_FROM_ROOTS(current);
 		}
 		current = next;
 	}
@@ -869,7 +850,7 @@ static int gc_collect_roots(uint32_t *flags)
 	while (current != &GC_G(roots)) {
 		GC_REFCOUNT(current->ref)++;
 		if (GC_REF_GET_COLOR(current->ref) == GC_WHITE) {
-			count += gc_collect_white(current->ref, flags);
+			count += gc_collect_white(current->ref, flags, additional_buffer);
 		}
 		current = current->next;
 	}
@@ -905,16 +886,13 @@ static void gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buff
 tail_call:
 	if (root ||
 	    (GC_ADDRESS(GC_INFO(ref)) != 0 &&
-	     GC_REF_GET_COLOR(ref) == GC_BLACK)) {
+	     GC_REF_GET_COLOR(ref) == GC_BLACK &&
+	     GC_ADDRESS(GC_INFO(ref)) != GC_ROOT_BUFFER_MAX_ENTRIES)) {
 		GC_TRACE_REF(ref, "removing from buffer");
 		GC_REFCOUNT(ref)--;
 		if (root) {
-			if (EXPECTED(GC_ADDRESS(GC_INFO(root->ref)) < GC_ROOT_BUFFER_MAX_ENTRIES)) {
-				gc_remove_from_roots(root);
-			} else {
-				gc_remove_from_additional_roots(root);
-			}
 			GC_INFO(ref) = 0;
+			GC_REMOVE_FROM_ROOTS(root);
 			root = NULL;
 		} else {
 			GC_REMOVE_FROM_BUFFER(ref);
@@ -1008,7 +986,7 @@ ZEND_API int zend_gc_collect_cycles(void)
 		zend_refcounted *p;
 		gc_root_buffer to_free;
 		uint32_t gc_flags = 0;
-		gc_additional_buffer *additional_buffer_snapshot;
+		gc_additional_buffer *additional_buffer;
 #if ZEND_GC_DEBUG
 		zend_bool orig_gc_full;
 #endif
@@ -1032,8 +1010,8 @@ ZEND_API int zend_gc_collect_cycles(void)
 #endif

 		GC_TRACE("Collecting roots");
-		additional_buffer_snapshot = GC_G(additional_buffer);
-		count = gc_collect_roots(&gc_flags);
+		additional_buffer = NULL;
+		count = gc_collect_roots(&gc_flags, &additional_buffer);
 #if ZEND_GC_DEBUG
 		GC_G(gc_full) = orig_gc_full;
 #endif
@@ -1077,7 +1055,7 @@ ZEND_API int zend_gc_collect_cycles(void)
 				while (current != &to_free) {
 					p = current->ref;
 					GC_G(next_to_free) = current->next;
-					if (GC_TYPE(p) == IS_OBJECT) {
+					if ((GC_TYPE(p) & GC_TYPE_MASK) == IS_OBJECT) {
 						zend_object *obj = (zend_object*)p;

 						if (IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle]) &&
@@ -1114,7 +1092,7 @@ ZEND_API int zend_gc_collect_cycles(void)
 			p = current->ref;
 			GC_G(next_to_free) = current->next;
 			GC_TRACE_REF(p, "destroying");
-			if (GC_TYPE(p) == IS_OBJECT) {
+			if ((GC_TYPE(p) & GC_TYPE_MASK) == IS_OBJECT) {
 				zend_object *obj = (zend_object*)p;

 				if (EG(objects_store).object_buckets &&
@@ -1133,7 +1111,7 @@ ZEND_API int zend_gc_collect_cycles(void)
 					EG(objects_store).free_list_head = obj->handle;
 					p = current->ref = (zend_refcounted*)(((char*)obj) - obj->handlers->offset);
 				}
-			} else if (GC_TYPE(p) == IS_ARRAY) {
+			} else if ((GC_TYPE(p) & GC_TYPE_MASK) == IS_ARRAY) {
 				zend_array *arr = (zend_array*)p;

 				GC_TYPE(arr) = IS_NULL;
@@ -1155,10 +1133,10 @@ ZEND_API int zend_gc_collect_cycles(void)
 			current = next;
 		}

-		while (GC_G(additional_buffer) != additional_buffer_snapshot) {
-			gc_additional_buffer *next = GC_G(additional_buffer)->next;
-			efree(GC_G(additional_buffer));
-			GC_G(additional_buffer) = next;
+		while (additional_buffer != NULL) {
+			gc_additional_buffer *next = additional_buffer->next;
+			efree(additional_buffer);
+			additional_buffer = next;
 		}

 		GC_TRACE("Collection finished");
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -67,17 +67,6 @@ typedef struct _gc_root_buffer {
 	uint32_t                 refcount;
 } gc_root_buffer;

-#define GC_NUM_ADDITIONAL_ENTRIES \
-	((4096 - ZEND_MM_OVERHEAD - sizeof(void*) * 2) / sizeof(gc_root_buffer))
-
-typedef struct _gc_additional_bufer gc_additional_buffer;
-
-struct _gc_additional_bufer {
-	uint32_t              used;
-	gc_additional_buffer *next;
-	gc_root_buffer        buf[GC_NUM_ADDITIONAL_ENTRIES];
-};
-
 typedef struct _zend_gc_globals {
 	zend_bool         gc_enabled;
 	zend_bool         gc_active;
@@ -104,8 +93,6 @@ typedef struct _zend_gc_globals {
 	uint32_t zval_marked_grey;
 #endif

-	gc_additional_buffer *additional_buffer;
-
 } zend_gc_globals;

 #ifdef ZTS
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -519,7 +519,6 @@ ZEND_API zend_generator *zend_generator_update_current(zend_generator *generator
 							generator->execute_fake.prev_execute_data = original_execute_data;
 						}

-						root->execute_data->opline--; /* ZEND_YIELD(_FROM) already advance, so decrement opline to throw from correct place */
 						zend_throw_exception(zend_ce_ClosedGeneratorException, "Generator yielded from aborted, no return value available", 0);

 						EG(current_execute_data) = original_execute_data;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -175,6 +175,7 @@ ZEND_API void ZEND_FASTCALL _zend_hash_init(HashTable *ht, uint32_t nSize, dtor_
 	GC_REFCOUNT(ht) = 1;
 	GC_TYPE_INFO(ht) = IS_ARRAY;
 	ht->u.flags = (persistent ? HASH_FLAG_PERSISTENT : 0) | HASH_FLAG_APPLY_PROTECTION | HASH_FLAG_STATIC_KEYS;
+	ht->nTableSize = zend_hash_check_size(nSize);
 	ht->nTableMask = HT_MIN_MASK;
 	HT_SET_DATA_ADDR(ht, &uninitialized_bucket);
 	ht->nNumUsed = 0;
@@ -182,7 +183,6 @@ ZEND_API void ZEND_FASTCALL _zend_hash_init(HashTable *ht, uint32_t nSize, dtor_
 	ht->nInternalPointer = HT_INVALID_IDX;
 	ht->nNextFreeElement = 0;
 	ht->pDestructor = pDestructor;
-	ht->nTableSize = zend_hash_check_size(nSize);
 }

 static void ZEND_FASTCALL zend_hash_packed_grow(HashTable *ht)
@@ -1757,7 +1757,7 @@ static zend_always_inline void zend_array_dup_packed_elements(HashTable *source,

 static zend_always_inline uint32_t zend_array_dup_elements(HashTable *source, HashTable *target, int static_keys, int with_holes)
 {
-	uint32_t idx = 0;
+    uint32_t idx = 0;
 	Bucket *p = source->arData;
 	Bucket *q = target->arData;
 	Bucket *end = p + source->nNumUsed;
@@ -1785,7 +1785,7 @@ static zend_always_inline uint32_t zend_array_dup_elements(HashTable *source, Ha

 ZEND_API HashTable* ZEND_FASTCALL zend_array_dup(HashTable *source)
 {
-	uint32_t idx;
+    uint32_t idx;
 	HashTable *target;

 	IS_CONSISTENT(source);
@@ -1849,8 +1849,7 @@ ZEND_API HashTable* ZEND_FASTCALL zend_array_dup(HashTable *source)
 		target->u.flags = (source->u.flags & ~(HASH_FLAG_PERSISTENT|ZEND_HASH_APPLY_COUNT_MASK)) | HASH_FLAG_APPLY_PROTECTION;
 		target->nTableMask = source->nTableMask;
 		target->nNextFreeElement = source->nNextFreeElement;
-		target->nInternalPointer = source->nInternalPointer;
-
+		target->nInternalPointer = HT_INVALID_IDX;
 		HT_SET_DATA_ADDR(target, emalloc(HT_SIZE(target)));
 		HT_HASH_RESET(target);

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -301,26 +301,6 @@ static zend_always_inline zval *zend_hash_str_find_ind(const HashTable *ht, cons
 }


-static zend_always_inline int zend_hash_str_exists_ind(const HashTable *ht, const char *str, size_t len)
-{
-	zval *zv;
-
-	zv = zend_hash_str_find(ht, str, len);
-	return zv && (Z_TYPE_P(zv) != IS_INDIRECT ||
-			Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF);
-}
-
-static zend_always_inline zval *zend_symbtable_add_new(HashTable *ht, zend_string *key, zval *pData)
-{
-	zend_ulong idx;
-
-	if (ZEND_HANDLE_NUMERIC(key, idx)) {
-		return zend_hash_index_add_new(ht, idx, pData);
-	} else {
-		return zend_hash_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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -3,7 +3,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -46,8 +46,6 @@ int ini_parse(void);
 #define YYFREE free
 #endif

-#define ZEND_SYSTEM_INI CG(ini_parser_unbuffered_errors)
-
 /* {{{ zend_ini_do_op()
 */
 static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
@@ -55,7 +53,7 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
 	int i_result;
 	int i_op1, i_op2;
 	int str_len;
-	char str_result[MAX_LENGTH_OF_LONG+1];
+	char str_result[MAX_LENGTH_OF_LONG];

 	i_op1 = atoi(Z_STRVAL_P(op1));
 	zend_string_free(Z_STR_P(op1));
@@ -88,7 +86,7 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
 	}

 	str_len = zend_sprintf(str_result, "%d", i_result);
-	ZVAL_NEW_STR(result, zend_string_init(str_result, str_len, ZEND_SYSTEM_INI));
+	ZVAL_PSTRINGL(result, str_result, str_len);
 }
 /* }}} */

@@ -96,11 +94,7 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
 */
 static void zend_ini_init_string(zval *result)
 {
-	if (ZEND_SYSTEM_INI) {
-		ZVAL_EMPTY_PSTRING(result);
-	} else {
-		ZVAL_EMPTY_STRING(result);
-	}
+	ZVAL_EMPTY_PSTRING(result);
 }
 /* }}} */

@@ -113,12 +107,8 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2)
 	if (Z_TYPE_P(op1) != IS_STRING) {
 		zend_string *str = zval_get_string(op1);
 		/* ZEND_ASSERT(!Z_REFCOUNTED_P(op1)); */
-		if (ZEND_SYSTEM_INI) {
-			ZVAL_PSTRINGL(op1, ZSTR_VAL(str), ZSTR_LEN(str));
-			zend_string_release(str);
-		} else {
-			ZVAL_STR(op1, str);
-		}
+		ZVAL_PSTRINGL(op1, ZSTR_VAL(str), ZSTR_LEN(str));
+		zend_string_release(str);
 	}
 	op1_len = (int)Z_STRLEN_P(op1);
 	
@@ -127,7 +117,7 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2)
 	}
 	length = op1_len + (int)Z_STRLEN_P(op2);

-	ZVAL_NEW_STR(result, zend_string_extend(Z_STR_P(op1), length, ZEND_SYSTEM_INI));
+	ZVAL_NEW_STR(result, zend_string_extend(Z_STR_P(op1), length, 1));
 	memcpy(Z_STRVAL_P(result) + op1_len, Z_STRVAL_P(op2), Z_STRLEN_P(op2) + 1);
 }
 /* }}} */
@@ -150,7 +140,7 @@ static void zend_ini_get_constant(zval *result, zval *name)
 			convert_to_string(&tmp);
 			c = &tmp;
 		}
-		ZVAL_NEW_STR(result, zend_string_init(Z_STRVAL_P(c), Z_STRLEN_P(c), ZEND_SYSTEM_INI));
+		ZVAL_PSTRINGL(result, Z_STRVAL_P(c), Z_STRLEN_P(c));
 		if (c == &tmp) {
 			zend_string_release(Z_STR(tmp));
 		}
@@ -170,11 +160,11 @@ static void zend_ini_get_var(zval *result, zval *name)

 	/* Fetch configuration option value */
 	if ((curval = zend_get_configuration_directive(Z_STR_P(name))) != NULL) {
-		ZVAL_NEW_STR(result, zend_string_init(Z_STRVAL_P(curval), Z_STRLEN_P(curval), ZEND_SYSTEM_INI));
+		ZVAL_PSTRINGL(result, Z_STRVAL_P(curval), Z_STRLEN_P(curval));
 	/* ..or if not found, try ENV */
 	} else if ((envvar = zend_getenv(Z_STRVAL_P(name), Z_STRLEN_P(name))) != NULL ||
 			   (envvar = getenv(Z_STRVAL_P(name))) != NULL) {
-		ZVAL_NEW_STR(result, zend_string_init(envvar, strlen(envvar), ZEND_SYSTEM_INI));
+		ZVAL_PSTRING(result, envvar);
 	} else {
 		zend_ini_init_string(result);
 	}
@@ -292,8 +282,6 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 %left '|' '&' '^'
 %right '~' '!'

-%destructor { zval_ptr_dtor(&$$); } TC_RAW TC_CONSTANT TC_NUMBER TC_STRING TC_WHITESPACE TC_LABEL TC_OFFSET TC_VARNAME BOOL_TRUE BOOL_FALSE NULL_NULL
-
 %%

 statement_list:
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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        |
@@ -110,8 +110,6 @@ ZEND_API ts_rsrc_id ini_scanner_globals_id;
 ZEND_API zend_ini_scanner_globals ini_scanner_globals;
 #endif

-#define ZEND_SYSTEM_INI CG(ini_parser_unbuffered_errors)
-
 /* Eat leading whitespace */
 #define EAT_LEADING_WHITESPACE()                     \
 	while (yyleng) {                                 \
@@ -139,7 +137,7 @@ ZEND_API zend_ini_scanner_globals ini_scanner_globals;
 #define EAT_TRAILING_WHITESPACE()	EAT_TRAILING_WHITESPACE_EX('X')

 #define zend_ini_copy_value(retval, str, len)	\
-	ZVAL_NEW_STR(retval, zend_string_init(str, len, ZEND_SYSTEM_INI))
+	ZVAL_NEW_STR(retval, zend_string_init(str, len, 1))


 #define RETURN_TOKEN(type, str, len) {                       \
@@ -408,9 +406,9 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 <INITIAL>"[" { /* Section start */
 	/* Enter section data lookup state */
 	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
-		BEGIN(ST_SECTION_RAW);
+		yy_push_state(ST_SECTION_RAW);
 	} else {
-		BEGIN(ST_SECTION_VALUE);
+		yy_push_state(ST_SECTION_VALUE);
 	}
 	return TC_SECTION;
 }
@@ -438,7 +436,7 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 	EAT_TRAILING_WHITESPACE_EX('[');

 	/* Enter offset lookup state */
-	BEGIN(ST_OFFSET);
+	yy_push_state(ST_OFFSET);

 	RETURN_TOKEN(TC_OFFSET, yytext, yyleng);
 }
@@ -492,9 +490,9 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})

 <INITIAL>{TABS_AND_SPACES}*[=]{TABS_AND_SPACES}* { /* Start option value */
 	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
-		BEGIN(ST_RAW);
+		yy_push_state(ST_RAW);
 	} else {
-		BEGIN(ST_VALUE);
+		yy_push_state(ST_VALUE);
 	}
 	return '=';
 }
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 */
+/* Generated by re2c 0.13.5 */
 #line 3 "Zend/zend_ini_scanner_defs.h"

 enum YYCONDTYPE {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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-2017 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 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
Anatol Belski	721bcb2b7e	set release versions	2016-11-08 13:17:14 +01:00
Anatol Belski	c8ff491106	update NEWS	2016-11-08 13:16:20 +01:00
Anatol Belski	521838cf6d	Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: fix memory leak (cherry picked from commit `e87daf363b`)	2016-11-08 13:03:27 +01:00
Anatol Belski	35df4b1ae3	Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash (cherry picked from commit `99b242a6d0`) (cherry picked from commit `de643586de`)	2016-11-08 13:02:49 +01:00
Christoph M. Becker	a05e84c42b	Fix #72696 : imagefilltoborder stackoverflow on truecolor images We must not allow negative color values be passed to gdImageFillToBorder(), because that can lead to infinite recursion since the recursion termination condition will not necessarily be met. (cherry picked from commit `863d37ea66`) (cherry picked from commit `5693474997`)	2016-11-08 13:02:19 +01:00
Christoph M. Becker	bf00354cb7	Fix #72482 : Ilegal write/read access caused by gdImageAALine overflow Instead of rolling our own bounds check we use clip_1d() as it's done in gdImageLine() and in external libgd. We must not pass the image width and height, respectively, but rather the largest ordinate value that is allowed to be accessed, i.e. width-1 and height-1, respectively. (cherry picked from commit `6499581af7`) (cherry picked from commit `1b5543b8ab`)	2016-11-08 13:01:08 +01:00
Anatol Belski	44c55ec138	remove unreferenced var came in with merge (cherry picked from commit `6b21c28b0e`)	2016-11-08 12:59:12 +01:00
Stanislav Malyshev	9e1bc792df	Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle Proper soltion would be to call serialize/unserialize and deal with the result, but this requires more work that should be done by wddx maintainer (not me). (cherry picked from commit `6045de69c7`) Conflicts: ext/wddx/wddx.c (cherry picked from commit `8c67460a10`)	2016-11-08 12:58:56 +01:00
Bob Weinand	3106f0e746	Fixed build failure introduced by PR #2158 Note: AC_TRY_LINK interprets the source as part of a main function, ending up with int main() { /* ... / int main() { / ... */ } ; return 0; } here - Using AC_LINK_IFELSE with AC_LANG_SOURCE directly instead. (cherry picked from commit `36527eccbb`)	2016-11-07 12:04:22 +01:00