removing the NEWS entry for #41631 as we reverted the fix for now

Revert "Merge branch 'PHP-5.5' into PHP-5.6"
This reverts commit 98e67add15, reversing changes made to 2cdc1a2b74.
2026-11-09 02:00:49 +00:00 · 2014-08-27 15:31:35 +02:00 · 2014-08-27 15:28:06 +02:00 · 2014-08-27 15:27:57 +02:00 · 2014-08-27 10:55:37 +02:00 · 2014-08-27 05:16:41 +02:00
2487 changed files with 151551 additions and 269711 deletions
@@ -1,16 +0,0 @@
-; http://editorconfig.org/
-
-root = true
-
-[*.{c,h}]
-charset                  = UTF-8
-end_of_line              = LF
-indent_size              = 4
-indent_style             = tab
-insert_final_newline     = true
-tab_width                = 4
-trim_trailing_whitespace = true
-
-[*.yml]
-indent_size              = 2
-indent_style             = space
@@ -19,10 +19,6 @@
 *.tgz
 *.tar.gz
 *.tar.bz2
-*.tar.xz
-*.tar.gz.asc
-*.tar.bz2.asc
-*.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
 .deps
@@ -135,7 +131,6 @@ tests/*/*.sh
 */tests/*/*.sh
 */*/tests/*.diff
 */*/tests/*.out
-*/*/tests/*.out.png
 */*/tests/*.php
 */*/tests/*.exp
 */*/tests/*.log
@@ -220,6 +215,10 @@ ext/reflection/spl.chm
 ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
+ext/sqlite/weztest.sqlite
+ext/sqlite/libsqlite/src/sqlite.h
+ext/sqlite/libsqlite/src/parse.out
+ext/sqlite/libsqlite/src/libsqlite.dsw
 ext/sqlite3/tests/phpsql*
 ext/sqlite3/tests/*.db
 ext/sqlite3/tests/*.tmp
@@ -1,31 +1,12 @@
-dist: precise
-language: c
-sudo: false
-addons:
-  apt:
-    packages:
-      - locales
-      - language-pack-de
-      - re2c
-      - libgmp-dev
-      - libicu-dev
-      - libmcrypt-dev
-      - libtidy-dev
-      - libenchant-dev
-      - libaspell-dev
-      - libpspell-dev
-      - librecode-dev
+language: php
+
+php:
+    # We only specify one version so we only get one worker
+    - 5.4

 notifications:
    email: 
       on_failure: change
-    irc:
-      template:
-        - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} -  Change view : %{compare_url} - Build details : %{build_url}"
-      channels:
-        - "irc.efnet.org#php.pecl"
-      on_success: change
-      on_failure: always

 cache: 
    - apt
@@ -43,6 +24,12 @@ env:
      - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1

+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
+    - sudo cp ./travis/de /var/lib/locales/supported.d/de
+    - sudo dpkg-reconfigure locales
+
 before_script:
    # Compile PHP
    - ./travis/compile.sh
@@ -55,5 +42,5 @@ before_script:

 # Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
    - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg
@@ -42,7 +42,7 @@ Exceptions:

 4.  When writing functions that deal with strings, be sure to remember
    that PHP holds the length property of each string, and that it
-    shouldn't be calculated with strlen().  Write your functions in such
+    shouldn't be calculated with strlen().  Write your functions in a such
    a way so that they'll take advantage of the length property, both
    for efficiency and in order for them to be binary-safe.
    Functions that change strings and obtain their new lengths while
@@ -74,7 +74,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           fpm
-PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
+PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>, Jerome Loyet <fat@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3.3
@@ -181,8 +181,8 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_dblib
-PRIMARY MAINTAINER:  Adam Baratz <adambaratz@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
@@ -205,7 +205,7 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_oci
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -385,12 +385,6 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           hash
-PRIMARY MAINTAINER:  Sara Golemon <pollita@php.net>, Mike Wallner <mike@php.net>, Anatol Belski <ab@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.1.2
-------------------------------------------------------------------------------
 EXTENSION:           iconv
 PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
@@ -444,12 +438,6 @@ PRIMARY MAINTAINER:  Frank M. Kromann
 MAINTENANCE:         Unknown
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           opcache
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.5.0
-------------------------------------------------------------------------------
 EXTENSION:           openssl
 PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
@@ -155,7 +155,7 @@ Table of Contents
   a  list  of all available options along with short explanations running
   ./configure   --help.   Our  manual  documents  the  different  options
   separately.  You  will find the core options in the appendix, while the
-   different  extension  specific  options  are  described on the reference
+   different  extension  specific  options  are  descibed on the reference
   pages.

   When  PHP  is  configured,  you  are  ready  to build the module and/or
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2016 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2014 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ php_lcov.info: lcov-test
 			cp $$x.bbg  lcov_data/$$y.bbg ; \
 		fi; \
 	done; \
-	for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
+	for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
 		if test -d lcov_data/$$dir; then \
 			rm -rf lcov_data/$$dir ; \
 		fi; \
@@ -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"`; \
@@ -12,7 +12,7 @@ Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
 some basic rules with regards to Git usage will::

   a. Make everybody happier, especially those responsible for maintaining
-      PHP itself.
+      Git itself.

   b. Keep the changes consistently well documented and easily trackable.

@@ -48,13 +48,15 @@ Currently we have the following branches in use::
  PHP-5.6   Is used to release the PHP 5.6.x series. This is a current
            stable version and is open for bugfixes only.

-  PHP-5.5   Is used to release the PHP 5.5.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
+            stable version and is open for bugfixes only.

-  PHP-5.4   Is used to release the PHP 5.4.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
+            stable version and is open for bugfixes only.

-  PHP-5.3   This branch is closed.
+  PHP-5.3   Is used to release the PHP 5.3.x series. This is currently 
+            in extended support and open forsecurity fixes only. Triaged
+            via security@php.net

  PHP-5.2   This branch is closed.

@@ -67,7 +69,7 @@ Currently we have the following branches in use::

 The next few rules are more of a technical nature::

-   1. All changes should first go to the lowest branch (i.e. 5.6) and then
+   1. All changes should first go to the lowest branch (i.e. 5.3) and then 
      get merged up to all other branches. If a change is not needed for
      later branches (i.e. fixes for features which where dropped from later
      branches) an empty merge should be done.
@@ -196,11 +196,11 @@ last commit id to web/php.git, then, mirrors will now sync
 Getting the stable release announced
 ------------------------------------

-1. Update phpweb/include/releases.inc with the old release info
-  (updates the download archives)
+1. Run the bumpRelease script for phpweb on your local checkout

- a. You can run ``php bin/bumpRelease 5`` if you are making a release for the
-    highest branch, otherwise you have to do this manually, see point 1.b
+ a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
+    The release announcement file should list in detail security fixes and
+    changes in behavior (whether due to a bug fix or not).

 b. In case multiple PHP minor versions are in active development you have
    to manually copy the old information to include/releases.inc
@@ -213,18 +213,15 @@ Getting the stable release announced

 c. ``$PHP_X_MD5`` array and update all the md5 sums

- d. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+ d. set ``$PHP_X_RC`` to false!

- e. set ``$PHP_X_RC`` to false!
-
- f. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. Make sure there are no outdated "notes" or edited "date" keys in the
 ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

- g. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
+ f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")

-3. Create the release file (releases/x_y_z.php)
-   Usually we use the same content as for point 6, but included in php template
-   instead of the release xml.
+3. Update phpweb/include/releases.php with the old release info
+  (updates the download archives)

 4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
   (prepare for next RC)
@@ -269,9 +266,6 @@ to upgrade.
 9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.
-Please make sure that the mail to php-announce@ is its own completely seperate email.
-This is to make sure that repiles to the announcement on php-general@ or internals@
-will not accidentally hit the php-announce@ mailinglist.

 Re-releasing the same version (or -pl)
 --------------------------------------
@@ -288,9 +282,7 @@ Re-releasing the same version (or -pl)

 d. ``$PHP_X_MD5`` array and update all the md5 sums

- e. ``$PHP_X_SHA256`` array and update all the SHA256 sums
-
- f. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. Make sure there are no outdated "notes" or edited "date" keys in the
 ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

 3. Add a short notice to phpweb stating that there is a new release, and
@@ -307,6 +299,3 @@ to upgrade.
 5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 the news entry.
-Please make sure that the mail to php-announce@ is its own completely seperate email.
-This is to make sure that repiles to the announcement on php-general@ or internals@
-will not accidentally hit the php-announce@ mailinglist.
@@ -8,7 +8,7 @@ the original run-tests.php script.  server-tests is *not* used by
 'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
 PHP tests under any of the SAPI modules that are direct executables, 
-or are accessible via HTTP.
+or are accessable via HTTP.

 [New features]
 ----------------
@@ -95,7 +95,7 @@ include:
  $filename     full native path to file, will become PATH_TRANSLATED
  $filepath     =dirname($filename)
  $scriptname   this is what will become SCRIPT_NAME unless you override it
-  $docroot      the equivalent of DOCUMENT_ROOT under Apache
+  $docroot      the equivelant of DOCUMENT_ROOT under Apache
  $cwd          the directory that the test is being initiated from
  $this->conf   all server-tests configuration vars
  $this->env    all environment variables that will get passed to the test
@@ -105,7 +105,7 @@ include:
 This section is also eval'd, and is similar in nature to --ENV--.  However,
 this section is used to build the url used in an HTTP request.  Valid values
 to set in this section would include:
-  SCRIPT_NAME   The initial part of the request url
+  SCRIPT_NAME   The inital part of the request url
  PATH_INFO     The pathinfo part of a request url
  FRAGMENT      The fragment section of a url (after #)
  QUERY_STRING  The query part of a url (after ?)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -616,12 +616,6 @@ TSRM_API int shmget(int key, int size, int flags)
 		}
 	} else {
 		if (flags & IPC_EXCL) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	}
@@ -660,27 +654,17 @@ 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;
 	}

-	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
-
-	err = GetLastError();
-	if (err) {
-		/* Catch more errors */
-		if (ERROR_NOT_ENOUGH_MEMORY == err) {
-			_set_errno(ENOMEM);
-		}
-		return (void*)-1;
-	}
-
 	shm->descriptor->shm_atime = time(NULL);
 	shm->descriptor->shm_lpid  = getpid();
 	shm->descriptor->shm_nattch++;

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

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -61,9 +61,6 @@ PHP 5.6 UPGRADE NOTES
  longer accept keys or IVs with incorrect sizes. Furthermore an IV is now
  required if the used block cipher mode requires it.

- cURL:
-  Uploads using the @file syntax are now unsupported by default.
-
 ========================================
 2. New Features
 ========================================
@@ -218,12 +215,8 @@ PHP 5.6 UPGRADE NOTES
    . CURLOPT_KRBLEVEL
    . CURLOPT_KRB4LEVEL

-  curl_getinfo($ch, CURLINFO_CERTINFO) returns certificate Subject and Issuer
-  as a string (PHP >= 5.6.25)
-
 - Strings:
  substr_compare() now allows $length to be zero.
-  pack() and unpack() now support 64-bit format specifiers: q, Q, J and P.

 - Crypt:
  crypt() will now raise an E_NOTICE error if the salt parameter is omitted.
@@ -263,26 +256,12 @@ PHP 5.6 UPGRADE NOTES
  Manipulated serialization strings for objects implementing Serializable by
  replacing "C:" with "O:" at the start will now produce an error.

- parse_ini_file():
- parse_ini_string():
-  Added scanner mode INI_SCANNER_TYPED to yield typed .ini values. 
-  For PHP >= 5.6.1
-
- JSON:
-  Added JSON_PRESERVE_ZERO_FRACTION option (PHP >= 5.6.5)
-
 ========================================
 6. New Functions
 ========================================

- Datetime:
-  Added DatePeriod::getStartDate(), DatePeriod::getEndDate(), DatePeriod::getDateInterval() in 5.6.5.
-
 - GMP:
  Added gmp_root($a, $nth) and gmp_rootrem($a, $nth) for calculating nth roots.
-  Added gmp_import($data, $word_size = 1, $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN) in PHP 5.6.1.
-  Added gmp_export($gmpnumber, $word_size = 1, $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN) in PHP 5.6.1.
-  Added gmp_random_range() and gmp_random_bits() in PHP 5.6.3.

 - Hash
  Added hash_equals($known_string, $user_string)
@@ -310,15 +289,12 @@ PHP 5.6 UPGRADE NOTES
  Added PDO::pgsqlGetNotify($result_type = PDO::FETCH_USE_DEFAULT, $ms_timeout = 0)
  Added PDO::pgsqlGetPid()

- Reflection
-  Added ReflectionFunction::isVariadic() and ReflectionParameter::isVariadic().
+- Zip:
+  Added ZipArchive::setPassword($password)

 - SPL
  Added SplFileObject::fread($length) to complement fwrite() method (>= 5.5.11)

- Zip:
-  Added ZipArchive::setPassword($password)
-
 ========================================
 7. New Classes and Interfaces
 ========================================
@@ -393,19 +369,10 @@ PHP 5.6 UPGRADE NOTES
  - Added LISTEN/NOTIFY support via PDO::pgsqlGetNotify / PDO::pgsqlGetPid()
    as described in https://bugs.php.net/bug.php?id=42614.

- DOM:
-  - DOMNode::textContent is now a writeable property. (>= 5.6.1)
-
 ========================================
 10. New Global Constants
 ========================================

- CURL:
-  CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2 (>= 5.6.8)
-
- GD:
-  IMG_WEBP (>= 5.6.25)
-
 - LDAP:
  LDAP_ESCAPE_FILTER int(1)
  LDAP_ESCAPE_DN     int(2)
@@ -1,25 +0,0 @@
--TEST--
-Next free element may overflow in array literals
--FILE--
-<?php
-
-$i = PHP_INT_MAX;
-$array = [$i => 42, new stdClass];
-var_dump($array);
-
-const FOO = [PHP_INT_MAX => 42, "foo"];
-var_dump(FOO);
-
-?>
--EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-array(1) {
-  [%d]=>
-  int(42)
-}
-
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-array(1) {
-  [%d]=>
-  int(42)
-}
@@ -1,5 +1,5 @@
 --TEST--
-Bug #43201 (Crash on using uninitialized vals and __get/__set)
+Bug #43201 (Crash on using unitialized vals and __get/__set)
 --FILE--
 <?php
 class Foo {
@@ -1,5 +1,7 @@
 --TEST--
 Bug #63336 (invalid E_NOTICE error occur)
+--XFAIL--
+Bug is not fixed yet
 --FILE--
 <?php
 error_reporting(E_ALL | E_NOTICE );
@@ -16,7 +18,7 @@ class Child extends Base {
    public function bar($var, $more=self::DUMMY) { return true; }
 }
 ?>
--EXPECTF--
-Strict Standards: Declaration of Child::foo() should be compatible with Base::foo($var = TEST, $more = NULL) in %sbug63336.php on line %d
+--EXPECT--
+Strict Standards: Declaration of Child::foo() should be compatible with Base::foo($var = '123', $more = NULL) in %sbug63336.php on line %d

-Strict Standards: Declaration of Child::bar() should be compatible with Base::bar($more = self::DUMMY) in %sbug63336.php on line %d
+Strict Standards: Declaration of Child::bar() should be compatible with Base::bar($var, $more = 'XXX') in %sbug63336.php on line %d
@@ -1,23 +0,0 @@
--TEST--
-Bug #65419 (Inside trait, self::class != __CLASS__)
--FILE--
-<?php
-trait abc
-{
-  static function def()
-  {
-    echo self::class, "\n";
-    echo __CLASS__, "\n";
-  }
-}
-
-class ghi
-{
-  use abc;
-}
-
-ghi::def();
-?>
--EXPECTF--
-ghi
-ghi
@@ -1,28 +0,0 @@
--TEST--
-Bug #66609 (php crashes with __get() and ++ operator in some cases)
--FILE--
-<?php
-$bar = new Bar;
-$foo = new Foo;
-class Bar {
-	public function __get($x) {
-		global $foo;
-		return $foo->foo;
-	}
-}
-class Foo {
-	public function __get($x) {
-		global $bar;
-		return $bar->bar;
-	}
-}
-$foo->blah += 1; //crash
-++$foo->blah;    //crash
-$foo->blah++;    //crash
-$foo->blah--;    //crash
--$foo->blah;    //crash
-echo "okey";
-?>
--EXPECTF--
-Notice: Undefined property: Bar::$bar in %sbug66609.php on line %d
-okey
@@ -1,20 +0,0 @@
--TEST--
-Bug #67111: Memory leak when using "continue 2" inside two foreach loops
--FILE--
-<?php
-
-$array1 = [1, 2, 3];
-$array2 = [1, 2, 3];
-
-foreach ($array1 as $x) {
-    foreach ($array2 as $y) {
-        echo "$x.$y\n";
-        continue 2;
-    }
-}
-
-?>
--EXPECT--
-1.1
-2.1
-3.1
@@ -1,22 +0,0 @@
--TEST--
-Bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
--FILE--
-<?php
-function crash()
-{
-    $notDefined[$i] = 'test';
-}
-
-function error_handler() { return false; }
-
-set_error_handler('error_handler');
-crash();
-echo "made it once\n";
-crash();
-echo "ok\n";
--EXPECTF--
-Notice: Undefined variable: i in %sbug67314.php on line 4
-made it once
-
-Notice: Undefined variable: i in %sbug67314.php on line 4
-ok
@@ -2,14 +2,14 @@
 bug67436: Autoloader isn't called if user defined error handler is present

 --INI--
-error_reporting=-1
+error_reporting=

 --FILE--
 <?php

 spl_autoload_register(function($classname) {
 	if (in_array($classname, array('a','b','c'))) {
-		require_once __DIR__ . "/{$classname}.php";
+		require_once ($classname . '.php');
 	}
 });

@@ -9,7 +9,7 @@ error_reporting=-1

 spl_autoload_register(function($classname) {
 	if (in_array($classname, array('a','b','c'))) {
-		require_once __DIR__ . "/{$classname}.php";
+		require_once ($classname . '.php');
 	}
 });

@@ -19,6 +19,6 @@ $b = new b();
 $b->test();

 --EXPECTF--
-Strict Standards: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s%ebug67436%eb.php on line %d
+Strict Standards: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s/bug67436/b.php on line %d
 b::test()
 a::test(c::TESTCONSTANT)
@@ -1,44 +0,0 @@
--TEST--
-Bug #67633: A foreach on an array returned from a function not doing copy-on-write
--FILE--
-<?php
-
-function id($x) {
-    return $x;
-}
-
-function &ref_id(&$x) {
-    return $x;
-}
-
-$c = 'c';
-$array = ['a', 'b', $c];
-
-foreach(id($array) as &$v) {
-    $v .= 'q';
-}
-var_dump($array);
-
-foreach(ref_id($array) as &$v) {
-    $v .= 'q';
-}
-var_dump($array);
-
-?>
--EXPECT--
-array(3) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-array(3) {
-  [0]=>
-  string(2) "aq"
-  [1]=>
-  string(2) "bq"
-  [2]=>
-  &string(2) "cq"
-}
@@ -1,27 +0,0 @@
--TEST--
-Bug #67938: Segfault when extending interface method with variadic
--FILE--
-<?php
-
-interface TestInterface {
-    public function foo();
-    public function bar(array $bar);
-}
-
-class Test implements TestInterface {
-    public function foo(...$args) {
-        echo __METHOD__, "\n";
-    }
-    public function bar(array $bar, ...$args) {
-        echo __METHOD__, "\n";
-    }
-}
-
-$obj = new Test;
-$obj->foo();
-$obj->bar([]);
-
-?>
--EXPECT--
-Test::foo
-Test::bar
@@ -1,16 +0,0 @@
--TEST--
-Bug #67985 - Last used array index not copied to new array at assignment
--FILE--
-<?php
-
-$a = ['zero', 'one', 'two'];
-unset($a[2]);
-$b = $a;
-$a[] = 'three';
-$b[] = 'three';
-
-var_dump($a === $b);
-
-?>
--EXPECT--
-bool(true)
@@ -1,21 +0,0 @@
--TEST--
-Bug #68118: $a->foo .= 'test'; can leave $a->foo undefined
--FILE--
-<?php
-
-set_error_handler(function() {
-    $obj = new stdClass;
-    $obj->test = 'meow';
-    return true;
-});
- 
-$a = new stdClass;
-$a->undefined .= 'test';
-var_dump($a);
-
-?>
--EXPECT--
-object(stdClass)#2 (1) {
-  ["undefined"]=>
-  string(4) "test"
-}
@@ -1,18 +0,0 @@
--TEST--
-Bug #68370 "unset($this)" can make the program crash
--FILE--
-<?php
-class C {
-	public function test() {
-		unset($this);
-		return get_defined_vars();
-	}
-}
-$c = new C();
-$x = $c->test();
-print_r($x);
-unset($c, $x);
--EXPECTF--
-Array
-(
-)
@@ -1,36 +0,0 @@
--TEST--
-Bug #68446 (Array constant not accepted for array parameter default)
--FILE--
-<?php
-const FOO = [1];
-const BAR = null;
-
-function a(array $a = FOO) {
-	var_dump($a);
-}
-
-function b(array $b = BAR) {
-	var_dump($b);
-}
-
-b(null);
-b([]);
-b();
-a([]);
-a();
-a(null);
-?>
--EXPECTF--
-NULL
-array(0) {
-}
-NULL
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-
-Catchable fatal error: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s on line %d
-
@@ -1,40 +0,0 @@
--TEST--
-Bug #68652 (segmentation fault in destructor)
--FILE--
-<?php
-class Foo {
-
-    private static $instance;
-    public static function getInstance() {
-        if (isset(self::$instance)) {
-            return self::$instance;
-        }
-        return self::$instance = new self();
-    }
-
-    public function __destruct() {
-        Bar::getInstance();
-    }
-}
-
-class Bar {
-
-    private static $instance;
-    public static function getInstance() {
-        if (isset(self::$instance)) {
-            return self::$instance;
-        }
-        return self::$instance = new self();
-    }
-
-    public function __destruct() {
-        Foo::getInstance();
-    }
-}
-
-
-$foo = new Foo();
-?>
--EXPECTF--
-Fatal error: Access to undeclared static property: Bar::$instance in %sbug68652.php on line %d
-
@@ -1,42 +0,0 @@
--TEST--
-#69017 (Fail to push to the empty array with the constant value defined in class scope)
--FILE--
-<?php
-
-class c1
-{
-	const ZERO = 0;
-	const ONE = 1;
-	const MAX = PHP_INT_MAX;
-	public static $a1 = array(self::ONE => 'one');
-	public static $a2 = array(self::ZERO => 'zero');
-	public static $a3 = array(self::MAX => 'zero');
-}
-
-
-c1::$a1[] = 1;
-c1::$a2[] = 1;
-c1::$a3[] = 1;
-
-var_dump(c1::$a1);
-var_dump(c1::$a2);
-var_dump(c1::$a3);
-?>
--EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %sbug69017.php on line %d
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(1)
-}
-array(2) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  int(1)
-}
-array(1) {
-  [%d]=>
-  string(4) "zero"
-}
@@ -1,16 +0,0 @@
--TEST--
-Bug #69174 (leaks when unused inner class use traits precedence)
--FILE--
-<?php
-function test() {
-	class C1 {
-		use T1, T2 {
-			T1::foo insteadof T2;
-			T1::bar insteadof T2;
-		}
-	}
-}
-?>
-==DONE==
--EXPECT--
-==DONE==
@@ -1,43 +0,0 @@
--TEST--
-Bug #69212: Leaking VIA_HANDLER func when exception thrown in __call/... arg passing
--FILE--
-<?php
-
-class Test {
-    public static function __callStatic($method, $args) {}
-    public function __call($method, $args) {}
-}
-
-function do_throw() { throw new Exception; }
-
-try {
-    Test::foo(do_throw());
-} catch (Exception $e) {
-    echo "Caught!\n";
-}
-try {
-    (new Test)->bar(do_throw());
-} catch (Exception $e) {
-    echo "Caught!\n";
-}
-
-try {
-	$f = function () {};
-	$f->__invoke(do_throw());
-} catch (Exception $e) {
-	echo "Caught!\n";
-}
-
-try {
-	$t = new Test;
-	$f->__invoke($t->bar(Test::foo(do_throw())));
-} catch (Exception $e) {
-	echo "Caught!\n";
-}
-
-?>
--EXPECT--
-Caught!
-Caught!
-Caught!
-Caught!
@@ -1,24 +0,0 @@
--TEST--
-Bug #69221: Segmentation fault when using a generator in combination with an Iterator
--FILE--
-<?php
-
-function gen() {
-	yield 1;
-};
-
-$gen1 = gen();
-$gen2 = (object) $gen1;
-
-foreach ($gen1 as $v1) {
-    foreach ($gen2 as $v2) {
-        break 2;
-    }
-}
-
-unset($gen1);
-foreach ($gen2 as $v) { var_dump($v); }
-
-?>
--EXPECTF--
-int(1)
@@ -1,20 +0,0 @@
--TEST--
-Bug #69221: Segmentation fault when using a generator in combination with an Iterator (2)
--FILE--
-<?php
-
-$gen = function() {
-    yield 1;
-};
-
-$iter = new IteratorIterator($gen());
-$ngen = $iter->getInnerIterator();
-
-var_dump(iterator_to_array($ngen, false));
-
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}
@@ -1,30 +0,0 @@
--TEST--
-Bug #69420 (Invalid read in zend_std_get_method)
--FILE--
-<?php
-
-trait T {
-	protected function test() {
-		echo "okey";
-	}
-}
-
-
-class A {
-	protected function test() {
-	}
-}
-
-class B extends A {
-	use T;
-	public function foo() {
-		$this->test();
-	}
-}
-
-
-$b = new B();
-$b->foo();
-?>
--EXPECT--
-okey
@@ -1,21 +0,0 @@
--TEST--
-Bug #69467 (Wrong checked for the interface by using Trait)
--FILE--
-<?php
-interface Baz {
-    public function bad();
-}
-
-trait Bar{
-    protected function bad(){}
-}
-
-class Foo implements Baz{
-    use Bar;
-}
-
-$test = new Foo();
-var_dump($test instanceof Baz);
-?>
--EXPECTF--
-Fatal error: Access level to Bar::bad() must be public (as in class Baz) in %sbug69467.php on line %d
@@ -1,19 +0,0 @@
--TEST--
-Bug #69537 (__debugInfo with empty string for key gives error)
--FILE--
-<?php
-class Foo {
-
-    public function __debugInfo(){
-        return ['' => 1];
-    }
-}
-
-var_dump(new Foo);
-?>
--EXPECTF--
-object(Foo)#%d (%d) {
-  [""]=>
-  int(1)
-}
-
@@ -1,16 +0,0 @@
--TEST--
-Bug #69551 - parse_ini_file() and parse_ini_string() segmentation fault
--FILE--
-<?php
-$ini = <<<INI
-[Network.eth0]
-SubnetMask = "
-"
-INI;
-$settings = parse_ini_string($ini, false, INI_SCANNER_RAW);
-var_dump($settings);
-?>
--EXPECTF--
-Warning: syntax error, unexpected '"' in Unknown on line %d
- in %s on line %d
-bool(false)
@@ -1,21 +0,0 @@
--TEST--
-Bug #69599: Strange generator+exception+variadic crash
--FILE--
-<?php
-
-function crash() {
-    sin(...[0]);
-    throw new \Exception();
-    yield;
-}
-
-iterator_to_array(crash());
-
-?>
--EXPECTF--
-Fatal error: Uncaught exception 'Exception' in %s:%d
-Stack trace:
-#0 [internal function]: crash()
-#1 %s(%d): iterator_to_array(Object(Generator))
-#2 {main}
-  thrown in %s on line %d
@@ -1,27 +0,0 @@
--TEST--
-Bug #69732 (can induce segmentation fault with basic php code)
--FILE--
-<?php
-class wpq {
-    private $unreferenced;
- 
-    public function __get($name) {
-        return $this->$name . "XXX";
-    }
-}
- 
-function ret_assoc() {
-	$x = "XXX";
-    return array('foo' => 'bar', $x);
-}
- 
-$wpq = new wpq;
-$wpq->interesting =& ret_assoc();
-$x = $wpq->interesting;
-printf("%s\n", $x);
--EXPECTF--
-Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6
-
-Notice: Indirect modification of overloaded property wpq::$interesting has no effect in %sbug69732.php on line 16
-
-Fatal error: Cannot assign by reference to overloaded object in %sbug69732.php on line 16
@@ -1,28 +0,0 @@
--TEST--
-Bug #69740: finally in generator (yield) swallows exception in iteration
--FILE--
-<?php
-
-function generate() {
-    try {
-        yield 1;
-        yield 2;
-    } finally {
-        echo "finally\n";
-    }
-}
-
-foreach (generate() as $i) {
-    echo $i, "\n";
-    throw new Exception();
-}
-
-?>
--EXPECTF--
-1
-finally
-
-Fatal error: Uncaught exception 'Exception' in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
@@ -1,10 +0,0 @@
--TEST--
-Bug #69892: Different arrays compare indentical due to integer key truncation
--SKIPIF--
-<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); ?>
--FILE--
-<?php
-var_dump([0 => 0] === [0x100000000 => 0]);
-?>
--EXPECT--
-bool(false)
@@ -1,32 +0,0 @@
--TEST--
-Bug #70012 (Exception lost with nested finally block)
--FILE--
-<?php
-try {
-	echo "Outer try\n";
-	try {
-		echo "  Middle try\n";
-		throw new Exception();
-	} finally {
-		echo "  Middle finally\n";
-		try {
-			echo "    Inner try\n";
-		} finally {
-			echo "    Inner finally\n";
-		}
-	}
-	echo "Outer shouldnt get here\n";
-} catch (Exception $e) {
-	echo "Outer catch\n";
-} finally {
-	echo "Outer finally\n";
-}
-?>
--EXPECT--
-Outer try
-  Middle try
-  Middle finally
-    Inner try
-    Inner finally
-Outer catch
-Outer finally
@@ -1,9 +0,0 @@
--TEST--
-Bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
--FILE--
-<?php
-unserialize('O:12:"DateInterval":1:{s:4:"days";O:9:"Exception":7:{s:10:"'."\0".'*'."\0".'message";s:1:"x";s:17:"'."\0".'Exception'."\0".'string";s:1:"A";s:7:"'."\0".'*'."\0".'code";i:0;s:7:"'."\0".'*'."\0".'file";s:1:"a";s:7:"'."\0".'*'."\0".'line";i:1337;s:16:"'."\0".'Exception'."\0".'trace";a:0:{}s:19:"'."\0".'Exception'."\0".'previous";O:8:"stdClass":0:{}}}');
-?>
-OK
--EXPECT--
-OK
@@ -1,16 +0,0 @@
--TEST--
-Bug #70681: Segfault when binding $this of internal instance method to null
--FILE--
-<?php
-
-$c = (new ReflectionMethod('SplStack', 'count'))->getClosure(new SplStack);
-$c = $c->bindTo(null);
-
-$c = (new ReflectionFunction('strlen'))->getClosure();
-$c = $c->bindTo(null);
-var_dump($c("foo"));
-
-?>
--EXPECTF--
-Warning: Cannot unbind $this of internal method in %s on line %d
-int(3)
@@ -1,22 +0,0 @@
--TEST--
-Bug #70685: Segfault for getClosure() internal method rebind with invalid $this
--FILE--
-<?php
-
-class cls {}
-
-$c = (new ReflectionMethod('SplStack', 'count'))->getClosure(new SplStack);
-$c = $c->bindTo(new cls);
-var_dump($c);
-
-$c = (new ReflectionMethod('SplStack', 'count'))->getClosure(new SplStack);
-$c = $c->bindTo(new SplStack, 'cls');
-var_dump($c);
-
-?>
--EXPECTF--
-Warning: Cannot bind internal method SplDoublyLinkedList::count() to object of class cls in %s on line %d
-NULL
-
-Warning: Cannot bind function SplDoublyLinkedList::count to scope class cls in %s on line %d
-NULL
@@ -1,20 +0,0 @@
--TEST--
-Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
--FILE--
-<?php
-$ini = '[${ 	';
-
-$ini_file = __DIR__ . "/bug70748.ini";
-
-file_put_contents($ini_file, $ini);
-
-var_dump(parse_ini_file($ini_file));
-?>
--CLEAN--
-<?php
-unlink(__DIR__ . "bug70748.ini");
-?>
--EXPECTF--
-Warning: syntax error, unexpected $end, expecting '}' in %sbug70748.ini on line %d
- in %sbug70748.php on line %d
-bool(false)
@@ -1,24 +0,0 @@
--TEST--
-Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant)
--FILE--
-<?php
-
-namespace test {
-	use const nonexistent;
-
-	class test {
-		static function run(){
-			var_dump(nonexistent);
-			existent;
-		}
-	}
-}
-
-namespace {
-	define("test\\existent", "bug!", 1);
-	test\test::run();
-}
-?>
--EXPECTF--
-Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in %sbug70828.php on line %d
-string(11) "nonexistent"
@@ -1,37 +0,0 @@
--TEST--
-Bug #70944 (try{ } finally{} can create infinite chains of exceptions)
--FILE--
-<?php
-try {
-	$e = new Exception("Foo");
-	try {
-		throw  new Exception("Bar", 0, $e);
-	} finally {
-		throw $e;
-	}
-} catch (Exception $e) {
-	var_dump((string)$e);
-}
-
-try {
-	$e = new Exception("Foo");
-	try {
-		throw new Exception("Bar", 0, $e);
-	} finally {
-		throw new Exception("Dummy", 0, $e);
-	}
-} catch (Exception $e) {
-	var_dump((string)$e);
-}
-?>
--EXPECTF--
-string(%d) "exception 'Exception' with message 'Foo' in %sbug70944.php:%d
-Stack trace:
-#0 {main}"
-string(%d) "exception 'Exception' with message 'Foo' in %sbug70944.php:%d
-Stack trace:
-#0 {main}
-
-Next exception 'Exception' with message 'Dummy' in %sbug70944.php:%d
-Stack trace:
-#0 {main}"
@@ -1,22 +0,0 @@
--TEST--
-Bug #70957 (self::class can not be resolved with reflection for abstract class)
--FILE--
-<?php
-
-abstract class Foo
-{
-    function bar($a = self::class) {}
-}
-
-trait T {
-    public function bar() {
-    }
-}
-
-class Bar extends Foo
-{
-    use T;
-}
-?>
--EXPECTF--
-Strict Standards: Declaration of T::bar() should be compatible with Foo::bar($a = 'Foo') in %sbug70957.php on line %d
@@ -1,21 +0,0 @@
--TEST--
-Bug #70958 (Invalid opcode while using ::class as trait method paramater default value)
--FILE--
-<?php
-trait Foo
-{
-	function bar($a = self::class) {
-		var_dump($a);
-	}
-}
-
-class B {
-	use Foo;
-}
-
-$b = new B;
-
-$b->bar();
-?>
--EXPECT--
-string(1) "B"
@@ -1,23 +0,0 @@
--TEST--
-Bug #71841 (EG(error_zval) is not handled well)
--INI--
-error_reporting=0
--FILE--
-<?php
-$z = unserialize('O:1:"A":0:{}');
-var_dump($z->e.=0);
-var_dump(++$z->x);
-var_dump($z->y++);
-
-$y = array(PHP_INT_MAX => 0);
-var_dump($y[] .= 0);
-var_dump(++$y[]);
-var_dump($y[]++);
-?>
--EXPECT--
-NULL
-NULL
-NULL
-NULL
-NULL
-NULL
@@ -1,43 +0,0 @@
--TEST--
-Bug #72496 (declare public method with signature incompatible with parent private method should not throw a warning)
--FILE--
-<?php
-class Foo
-{
-    private function getFoo()
-    {
-        return 'Foo';
-    }
-
-    private function getBar()
-    {
-        return 'Bar';
-    }
-
-    private function getBaz()
-    {
-        return 'Baz';
-    }
-}
-
-class Bar extends Foo
-{
-    public function getFoo($extraArgument)
-    {
-        return $extraArgument;
-    }
-
-    protected function getBar($extraArgument)
-    {
-        return $extraArgument;
-    }
-
-    private function getBaz($extraArgument)
-    {
-        return $extraArgument;
-    }
-}
-
-echo "OK\n";
--EXPECT--
-OK
@@ -1,18 +0,0 @@
--TEST--
-Bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))
--FILE--
-<?php
-
-$a = 0;
-
-($a->a = &$E) + ($b = $a->b->i -= 0);
-
-?>
--EXPECTF--
-Warning: Attempt to modify property of non-object in %sbug72907.php on line %d
-
-Warning: Attempt to modify property of non-object in %sbug72907.php on line %d
-
-Warning: Creating default object from empty value in %sbug72907.php on line %d
-
-Notice: Undefined property: stdClass::$i in %sbug72907.php on line %d
@@ -1,12 +0,0 @@
--TEST--
-Bug #73337 (try/catch not working with two exceptions inside a same operation)
--FILE--
-<?php
-class d { function __destruct() { throw new Exception; } }
-try { new d + new d; } catch (Exception $e) { print "Exception properly caught\n"; }
-?>
--EXPECTF--
-Notice: Object of class d could not be converted to int in %sbug73337.php on line 3
-
-Notice: Object of class d could not be converted to int in %sbug73337.php on line 3
-Exception properly caught
@@ -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,15 +0,0 @@
--TEST--
-Constexpr arrays should be able to handle resource keys
--FILE--
-<?php
-
-const FOO = [STDIN => 42];
-var_dump(FOO);
-
-?>
--EXPECTF--
-Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
-array(1) {
-  [%d]=>
-  int(42)
-}
@@ -1,7 +1,5 @@
 --TEST--
 Testing __debugInfo() magic method with bad returns RESOURCE
--INI--
-allow_url_fopen=1
 --FILE--
 <?php

@@ -1,18 +0,0 @@
--TEST--
-Testing declare statement with ticks
--SKIPIF--
--FILE--
-<?php
-register_tick_function(function () { echo "tick\n"; });
-function foo() { }
-
-declare(ticks=1) {
-
-$statement;
-foo();
-
-}
-?>
--EXPECTF--
-tick
-tick
@@ -13,5 +13,5 @@ var_dump(gc_collect_cycles());
 echo "ok\n";
 ?>
 --EXPECT--
-int(2)
+int(1)
 ok
@@ -1,22 +0,0 @@
--TEST--
-Bug #69419: Returning compatible sub generator produces a warning
--FILE--
-<?php
-
-function & genRefInner() {
-    $var = 1;
-    yield $var;
-}
-
-function & genRefOuter() {
-    return genRefInner();
-}
-
-foreach(genRefOuter() as $i) {
-    var_dump($i);
-}
-
-?>
--EXPECTF--
-Notice: Only variable references should be returned by reference in %s on line %d
-int(1)
@@ -1,19 +0,0 @@
--TEST--
-int memory_get_peak_usage ([ bool $real_usage = false ] );
--CREDITS--
-marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
--INI--
-memory_limit=-1
--FILE--
-<?php
-var_dump($a = memory_get_peak_usage());
-var_dump(memory_get_peak_usage(true));
-var_dump(memory_get_peak_usage(false));
-$array = range(1,1024*1024);
-var_dump(memory_get_peak_usage() > $a);
-?>
--EXPECTF--
-int(%d)
-int(%d)
-int(%d)
-bool(true)
@@ -3,8 +3,6 @@
 --FILE--
 <?php
 use A;
-use \B;
 --EXPECTF--
 Warning: The use statement with non-compound name 'A' has no effect in %sns_033.php on line 2

-Warning: The use statement with non-compound name 'B' has no effect in %sns_033.php on line 3
@@ -1,31 +0,0 @@
--TEST--
-Bug #65576 (Constructor from trait conflicts with inherited constructor)
--FILE--
-<?php
-
-trait T
-{
-  public function __construct()
-  {
-    echo "Trait contructor\n";
-  }
-}
-
-class A
-{
-  public function __construct()
-  {
-    echo "Parent constructor\n";
-  }
-}
-
-class B extends A
-{
-  use T;
-}
-
-new B();
-
--EXPECT--
-Trait contructor
-
@@ -1,33 +0,0 @@
--TEST--
-Bug #65576 (Constructor from trait conflicts with inherited constructor)
--FILE--
-<?php
-
-trait T
-{
-  public function __construct()
-  {
-    parent::__construct();
-    echo "Trait contructor\n";
-  }
-}
-
-class A
-{
-  public function __construct()
-  {
-    echo "Parent constructor\n";
-  }
-}
-
-class B extends A
-{
-  use T;
-}
-
-new B();
-
--EXPECT--
-Parent constructor
-Trait contructor
-
@@ -1,17 +0,0 @@
--TEST--
-Closure::__invoke() with variadic parameter
--FILE--
-<?php
-
-$closure = function(&...$refs) {};
-$closure->__invoke(
-    $v1,  $v2,  $v3,  $v4,
-    $v5,  $v6,  $v7,  $v8,
-    $v9, $v10, $v11, $v12,
-    $v13
-);
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -128,7 +128,7 @@ ZEND_API zval zval_used_for_init; /* True global variable */
 /* 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-2016 Zend Technologies\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2014 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 TSRMLS_DC) /* {{{ */
@@ -817,22 +817,11 @@ void zend_shutdown(TSRMLS_D) /* {{{ */
 {
 #ifdef ZEND_SIGNALS
 	zend_signal_shutdown(TSRMLS_C);
+#endif
+#ifdef ZEND_WIN32
+	zend_shutdown_timeout_thread();
 #endif
 	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
-
-	if (EG(active))
-	{
-		/*
-		 * The order of destruction is important here.
-		 * See bugs #65463 and 66036.
-		 */
-		zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) zend_cleanup_function_data_full TSRMLS_CC);
-		zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) zend_cleanup_user_class_data TSRMLS_CC);
-		zend_cleanup_internal_classes(TSRMLS_C);
-		zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) clean_non_persistent_function_full TSRMLS_CC);
-		zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) clean_non_persistent_class_full TSRMLS_CC);
-	}
-
 	zend_destroy_modules();

 	virtual_cwd_deactivate(TSRMLS_C);
@@ -898,7 +887,7 @@ ZEND_API void _zend_bailout(char *filename, uint lineno) /* {{{ */
 /* }}} */
 END_EXTERN_C()

-ZEND_API void zend_append_version_info(const zend_extension *extension) /* {{{ */
+void zend_append_version_info(const zend_extension *extension) /* {{{ */
 {
 	char *new_info;
 	uint new_info_length;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -1074,7 +1074,7 @@ static int zval_update_class_constant(zval **pp, int is_static, int offset TSRML
 						*scope = old_scope;
 						return ret;
 					}
-				}
+				}				
 				ce = ce->parent;
 			} while (ce);

@@ -1279,14 +1279,9 @@ ZEND_API int add_assoc_double_ex(zval *arg, const char *key, uint key_len, doubl
 ZEND_API int add_assoc_string_ex(zval *arg, const char *key, uint key_len, char *str, int duplicate) /* {{{ */
 {
 	zval *tmp;
-	size_t _len = strlen(str);
-
-	if (UNEXPECTED(_len > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}

 	MAKE_STD_ZVAL(tmp);
-	ZVAL_STRINGL(tmp, str, _len, duplicate);
+	ZVAL_STRING(tmp, str, duplicate);

 	return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
@@ -1296,10 +1291,6 @@ ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, uint key_len, char
 {
 	zval *tmp;

-	if (UNEXPECTED(length > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}
-
 	MAKE_STD_ZVAL(tmp);
 	ZVAL_STRINGL(tmp, str, length, duplicate);

@@ -1371,11 +1362,6 @@ ZEND_API int add_index_double(zval *arg, ulong index, double d) /* {{{ */
 ZEND_API int add_index_string(zval *arg, ulong index, const char *str, int duplicate) /* {{{ */
 {
 	zval *tmp;
-	size_t _len = strlen(str);
-
-	if (UNEXPECTED(_len > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}

 	MAKE_STD_ZVAL(tmp);
 	ZVAL_STRING(tmp, str, duplicate);
@@ -1388,10 +1374,6 @@ ZEND_API int add_index_stringl(zval *arg, ulong index, const char *str, uint len
 {
 	zval *tmp;

-	if (UNEXPECTED(length > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}
-
 	MAKE_STD_ZVAL(tmp);
 	ZVAL_STRINGL(tmp, str, length, duplicate);

@@ -1475,9 +1457,6 @@ ZEND_API int add_next_index_stringl(zval *arg, const char *str, uint length, int
 {
 	zval *tmp;

-	if (UNEXPECTED(length > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}
 	MAKE_STD_ZVAL(tmp);
 	ZVAL_STRINGL(tmp, str, length, duplicate);

@@ -1494,14 +1473,9 @@ ZEND_API int add_next_index_zval(zval *arg, zval *value) /* {{{ */
 ZEND_API int add_get_assoc_string_ex(zval *arg, const char *key, uint key_len, const char *str, void **dest, int duplicate) /* {{{ */
 {
 	zval *tmp;
-	size_t _len = strlen(str);
-
-	if (UNEXPECTED(_len > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}

 	MAKE_STD_ZVAL(tmp);
-	ZVAL_STRINGL(tmp, str, _len, duplicate);
+	ZVAL_STRING(tmp, str, duplicate);

 	return zend_symtable_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), dest);
 }
@@ -1511,10 +1485,6 @@ ZEND_API int add_get_assoc_stringl_ex(zval *arg, const char *key, uint key_len,
 {
 	zval *tmp;

-	if (UNEXPECTED(length > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}
-
 	MAKE_STD_ZVAL(tmp);
 	ZVAL_STRINGL(tmp, str, length, duplicate);

@@ -1694,14 +1664,9 @@ ZEND_API int add_property_string_ex(zval *arg, const char *key, uint key_len, co
 {
 	zval *tmp;
 	zval *z_key;
-	size_t _len = strlen(str);
-
-	if (UNEXPECTED(_len > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}

 	MAKE_STD_ZVAL(tmp);
-	ZVAL_STRINGL(tmp, str, _len, duplicate);
+	ZVAL_STRING(tmp, str, duplicate);

 	MAKE_STD_ZVAL(z_key);
 	ZVAL_STRINGL(z_key, key, key_len-1, 1);
@@ -1718,10 +1683,6 @@ ZEND_API int add_property_stringl_ex(zval *arg, const char *key, uint key_len, c
 	zval *tmp;
 	zval *z_key;

-	if (UNEXPECTED(length > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String overflow, max size is %d", INT_MAX);
-	}
-
 	MAKE_STD_ZVAL(tmp);
 	ZVAL_STRINGL(tmp, str, length, duplicate);

@@ -1805,12 +1766,6 @@ ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC) /* {{{
 }
 /* }}} */

-static int zend_startup_module_int(zend_module_entry *module TSRMLS_DC) /* {{{ */
-{
-	return (zend_startup_module_ex(module TSRMLS_CC) == SUCCESS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
-}
-/* }}} */
-
 static void zend_sort_modules(void *base, size_t count, size_t siz, compare_func_t compare TSRMLS_DC) /* {{{ */
 {
 	Bucket **b1 = base;
@@ -1881,7 +1836,7 @@ ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */
 	module_post_deactivate_handlers = module_request_shutdown_handlers + shutdown_count + 1;
 	module_post_deactivate_handlers[post_deactivate_count] = NULL;
 	startup_count = 0;
-
+	
 	for (zend_hash_internal_pointer_reset_ex(&module_registry, &pos);
 	     zend_hash_get_current_data_ex(&module_registry, (void *) &module, &pos) == SUCCESS;
 	     zend_hash_move_forward_ex(&module_registry, &pos)) {
@@ -1927,7 +1882,7 @@ ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */
 ZEND_API int zend_startup_modules(TSRMLS_D) /* {{{ */
 {
 	zend_hash_sort(&module_registry, zend_sort_modules, NULL, 0 TSRMLS_CC);
-	zend_hash_apply(&module_registry, (apply_func_t)zend_startup_module_int TSRMLS_CC);
+	zend_hash_apply(&module_registry, (apply_func_t)zend_startup_module_ex TSRMLS_CC);
 	return SUCCESS;
 }
 /* }}} */
@@ -2128,7 +2083,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
 		}
 		if (ptr->arg_info) {
 			zend_internal_function_info *info = (zend_internal_function_info*)ptr->arg_info;
-
+			
 			internal_function->arg_info = (zend_arg_info*)ptr->arg_info+1;
 			internal_function->num_args = ptr->num_args;
 			/* Currently you cannot denote that the function can accept less arguments than num_args */
@@ -2544,7 +2499,7 @@ ZEND_API void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */
 /* }}} */

 /* return the next free module number */
-ZEND_API int zend_next_free_module(void) /* {{{ */
+int zend_next_free_module(void) /* {{{ */
 {
 	return zend_hash_num_elements(&module_registry) + 1;
 }
@@ -2680,15 +2635,18 @@ ZEND_API ZEND_FUNCTION(display_disabled_function)
 }
 /* }}} */

+static zend_function_entry disabled_function[] = {
+	ZEND_FE(display_disabled_function,			NULL)
+	ZEND_FE_END
+};
+
 ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC) /* {{{ */
 {
-	zend_internal_function *func;
-	if (zend_hash_find(CG(function_table), function_name, function_name_length+1, (void **)&func)==SUCCESS) {
-		func->arg_info = NULL;
-		func->handler = ZEND_FN(display_disabled_function);
-		return SUCCESS;
+	if (zend_hash_del(CG(function_table), function_name, function_name_length+1)==FAILURE) {
+		return FAILURE;
 	}
-	return FAILURE;
+	disabled_function[0].fname = function_name;
+	return zend_register_functions(NULL, disabled_function, CG(function_table), MODULE_PERSISTENT TSRMLS_CC);
 }
 /* }}} */

@@ -2746,7 +2704,7 @@ static int zend_is_callable_check_class(const char *name, int name_len, zend_fca
 			}
 			ret = 1;
 		}
-	} else if (name_len == sizeof("parent") - 1 &&
+	} else if (name_len == sizeof("parent") - 1 && 
 		       !memcmp(lcname, "parent", sizeof("parent") - 1)) {
 		if (!EG(scope)) {
 			if (error) *error = estrdup("cannot access parent:: when no class scope is active");
@@ -3075,7 +3033,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
 	if (error) {
 		*error = NULL;
 	}
-
+	
 	fcc->initialized = 0;
 	fcc->calling_scope = NULL;
 	fcc->called_scope = NULL;
@@ -3087,7 +3045,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
 		object_ptr = NULL;
 	}
 	if (object_ptr &&
-	    (!EG(objects_store).object_buckets ||
+	    (!EG(objects_store).object_buckets || 
 	     !EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(object_ptr)].valid)) {
 		return 0;
 	}
@@ -3168,7 +3126,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
 						}

 					} else {
-						if (!EG(objects_store).object_buckets ||
+						if (!EG(objects_store).object_buckets || 
 						    !EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(obj)].valid) {
 							return 0;
 						}
@@ -3237,7 +3195,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
 					*callable_name = emalloc(*callable_name_len + 1);
 					memcpy(*callable_name, ce->name, ce->name_length);
 					memcpy((*callable_name) + ce->name_length, "::__invoke", sizeof("::__invoke"));
-				}
+				}									
 				return 1;
 			}
 			/* break missing intentionally */
@@ -3776,30 +3734,6 @@ ZEND_API void zend_update_property(zend_class_entry *scope, zval *object, const
 }
 /* }}} */

-ZEND_API void zend_unset_property(zend_class_entry *scope, zval *object, const char *name, int name_length TSRMLS_DC) /* {{{ */
-{
-	zval *property;
-	zend_class_entry *old_scope = EG(scope);
-
-	EG(scope) = scope;
-
-	if (!Z_OBJ_HT_P(object)->unset_property) {
-		const char *class_name;
-		zend_uint class_name_len;
-
-		zend_get_object_classname(object, &class_name, &class_name_len TSRMLS_CC);
-
-		zend_error(E_CORE_ERROR, "Property %s of class %s cannot be unset", name, class_name);
-	}
-	MAKE_STD_ZVAL(property);
-	ZVAL_STRINGL(property, name, name_length, 1);
-	Z_OBJ_HT_P(object)->unset_property(object, property, 0 TSRMLS_CC);
-	zval_ptr_dtor(&property);
-
-	EG(scope) = old_scope;
-}
-/* }}} */
-
 ZEND_API void zend_update_property_null(zend_class_entry *scope, zval *object, const char *name, int name_length TSRMLS_DC) /* {{{ */
 {
 	zval *tmp;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -233,7 +233,7 @@ typedef struct _zend_fcall_info_cache {

 #define ZEND_FCI_INITIALIZED(fci) ((fci).size != 0)

-ZEND_API int zend_next_free_module(void);
+int zend_next_free_module(void);

 BEGIN_EXTERN_C()
 ZEND_API int zend_get_parameters(int ht, int param_count, ...);
@@ -330,7 +330,6 @@ ZEND_API void zend_update_property_long(zend_class_entry *scope, zval *object, c
 ZEND_API void zend_update_property_double(zend_class_entry *scope, zval *object, const char *name, int name_length, double value TSRMLS_DC);
 ZEND_API void zend_update_property_string(zend_class_entry *scope, zval *object, const char *name, int name_length, const char *value TSRMLS_DC);
 ZEND_API void zend_update_property_stringl(zend_class_entry *scope, zval *object, const char *name, int name_length, const char *value, int value_length TSRMLS_DC);
-ZEND_API void zend_unset_property(zend_class_entry *scope, zval *object, const char *name, int name_length TSRMLS_DC);

 ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *name, int name_length, zval *value TSRMLS_DC);
 ZEND_API int zend_update_static_property_null(zend_class_entry *scope, const char *name, int name_length TSRMLS_DC);
@@ -448,7 +447,7 @@ ZEND_API int add_property_zval_ex(zval *arg, const char *key, uint key_len, zval
 #define add_property_double(__arg, __key, __d) add_property_double_ex(__arg, __key, strlen(__key)+1, __d TSRMLS_CC)
 #define add_property_string(__arg, __key, __str, __duplicate) add_property_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate TSRMLS_CC)
 #define add_property_stringl(__arg, __key, __str, __length, __duplicate) add_property_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate TSRMLS_CC)
-#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key)+1, __value TSRMLS_CC)
+#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key)+1, __value TSRMLS_CC)       


 ZEND_API int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, zend_uint param_count, zval *params[] TSRMLS_DC);
@@ -459,7 +458,7 @@ ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;

 /** Build zend_call_info/cache from a zval*
 *
- * Caller is responsible to provide a return value, otherwise the we will crash.
+ * Caller is responsible to provide a return value, otherwise the we will crash. 
 * fci->retval_ptr_ptr = NULL;
 * In order to pass parameters the following members need to be set:
 * fci->param_count = 0;
@@ -579,9 +578,6 @@ END_EXTERN_C()
 		const char *__s=(s);				\
 		zval *__z = (z);					\
 		Z_STRLEN_P(__z) = strlen(__s);		\
-		if (UNEXPECTED(Z_STRLEN_P(__z) < 0)) { \
-			zend_error(E_ERROR, "String size overflow"); \
-		}									\
 		Z_STRVAL_P(__z) = (duplicate?estrndup(__s, Z_STRLEN_P(__z)):(char*)__s);\
 		Z_TYPE_P(__z) = IS_STRING;			\
 	} while (0)
@@ -655,21 +651,6 @@ END_EXTERN_C()
 } while (0)
 #define RETURN_ZVAL_FAST(z) { RETVAL_ZVAL_FAST(z); return; }

-/* Check that returned string length fits int */
-#define RETVAL_STRINGL_CHECK(s, len, dup) do {	\
-	size_t __len = (len);					\
-	if (UNEXPECTED(__len > INT_MAX)) { 		\
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "String too long, max is %d", INT_MAX); \
-		if(!(dup)) { 						\
-			efree((s));						\
-		}									\
-		RETURN_FALSE;						\
-	}										\
-	RETVAL_STRINGL((s), (int)__len, (dup)); \
-} while (0)
-#define RETURN_STRINGL_CHECK(s, len, dup) { RETVAL_STRINGL_CHECK(s, len, dup); return; }
-
-
 #define SET_VAR_STRING(n, v) {																				\
 								{																			\
 									zval *var;																\
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -678,7 +678,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
 	__asm {
 		bsr eax, _size
 	}
-#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__))
+#elif defined(__GNUC__) && (defined(__arm__) ||  defined(__aarch64__))
 	return (8 * SIZEOF_SIZE_T - 1) - __builtin_clzl(_size);
 #else
 	unsigned int n = 0;
@@ -706,7 +706,7 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
 	__asm {
 		bsf eax, _size
   }
-#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__))
+#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))
 	return __builtin_ctzl(_size);
 #else
 	static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
@@ -984,7 +984,7 @@ static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
 	int has_context = 0;

 	if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
-		/* Could mean that the key container does not exist, let try
+		/* Could mean that the key container does not exist, let try 
 		   again by asking for a new one */
 		if (GetLastError() == NTE_BAD_KEYSET) {
 			if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
@@ -1348,7 +1348,7 @@ static int zend_mm_check_ptr(zend_mm_heap *heap, void *ptr, int silent ZEND_FILE
 	}
 	if (!silent) {
 		TSRMLS_FETCH();
-
+		
 		zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC);
 		zend_debug_alloc_output("---------------------------------------\n");
 		zend_debug_alloc_output("%s(%d) : Block "PTR_FMT" status:\n" ZEND_FILE_LINE_RELAY_CC, ptr);
@@ -2175,7 +2175,7 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_
 #if ZEND_MM_CACHE
 	if (ZEND_MM_SMALL_SIZE(true_size)) {
 		size_t index = ZEND_MM_BUCKET_INDEX(true_size);
-
+		
 		if (heap->cache[index] != NULL) {
 			zend_mm_free_block *best_fit;
 			zend_mm_free_block **cache;
@@ -2188,7 +2188,7 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_
 			heap->cache[index] = best_fit->prev_free_block;
 			ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
 			ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
-
+	
 			ptr = ZEND_MM_DATA_OF(best_fit);

 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
@@ -2470,7 +2470,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 	     : "%0"(res),
 	       "rm"(size),
 	       "rm"(offset));
-
+	
 	if (UNEXPECTED(overflow)) {
 		zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
 		return 0;
@@ -2578,15 +2578,6 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 #endif


-ZEND_API void *_safe_emalloc_string(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-{
-	size_t str_size = safe_address(nmemb, size, offset);
-	if (UNEXPECTED(str_size > INT_MAX)) {
-		zend_error_noreturn(E_ERROR, "String allocation overflow, max size is %d", INT_MAX);
-	}
-	return emalloc_rel(str_size);
-}
-
 ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	return emalloc_rel(safe_address(nmemb, size, offset));
@@ -2628,7 +2619,7 @@ ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LI

 ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
-	size_t length;
+	int length;
 	char *p;
 #ifdef ZEND_SIGNALS
 	TSRMLS_FETCH();
@@ -2636,13 +2627,13 @@ ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

 	HANDLE_BLOCK_INTERRUPTIONS();

-	length = strlen(s);
-	p = (char *) _emalloc(safe_address(length, 1, 1) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	length = strlen(s)+1;
+	p = (char *) _emalloc(length ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
 	}
-	memcpy(p, s, length+1);
+	memcpy(p, s, length);
 	HANDLE_UNBLOCK_INTERRUPTIONS();
 	return p;
 }
@@ -2656,7 +2647,7 @@ ZEND_API char *_estrndup(const char *s, uint length ZEND_FILE_LINE_DC ZEND_FILE_

 	HANDLE_BLOCK_INTERRUPTIONS();

-	p = (char *) _emalloc(safe_address(length, 1, 1) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	p = (char *) _emalloc(length+1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
@@ -2677,7 +2668,7 @@ ZEND_API char *zend_strndup(const char *s, uint length)

 	HANDLE_BLOCK_INTERRUPTIONS();

-	p = (char *) malloc(safe_address(length, 1, 1));
+	p = (char *) malloc(length+1);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
@@ -2735,9 +2726,9 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
 		alloc_globals->mm_heap = malloc(sizeof(struct _zend_mm_heap));
 		memset(alloc_globals->mm_heap, 0, sizeof(struct _zend_mm_heap));
 		alloc_globals->mm_heap->use_zend_alloc = 0;
-		alloc_globals->mm_heap->_malloc = __zend_malloc;
+		alloc_globals->mm_heap->_malloc = malloc;
 		alloc_globals->mm_heap->_free = free;
-		alloc_globals->mm_heap->_realloc = __zend_realloc;
+		alloc_globals->mm_heap->_realloc = realloc;
 	} else {
 		alloc_globals->mm_heap = zend_mm_startup();
 	}
@@ -2,10 +2,10 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
+   | that is bundled with this package in the file LICENSE, and is        | 
   | available through the world-wide-web at the following url:           |
   | http://www.zend.com/license/2_00.txt.                                |
   | If you did not receive a copy of the Zend license and are unable to  |
@@ -56,7 +56,6 @@ ZEND_API char *zend_strndup(const char *s, unsigned int length) ZEND_ATTRIBUTE_M

 ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_ALLOC_SIZE(1);
 ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
-ZEND_API void *_safe_emalloc_string(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
 ZEND_API void *_safe_malloc(size_t nmemb, size_t size, size_t offset) ZEND_ATTRIBUTE_MALLOC;
 ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_ALLOC_SIZE2(1,2);
@@ -70,7 +69,6 @@ ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_
 /* Standard wrapper macros */
 #define emalloc(size)						_emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 #define safe_emalloc(nmemb, size, offset)	_safe_emalloc((nmemb), (size), (offset) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define safe_emalloc_string(nmemb, size, offset)	_safe_emalloc_string((nmemb), (size), (offset) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 #define efree(ptr)							_efree((ptr) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 #define ecalloc(nmemb, size)				_ecalloc((nmemb), (size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 #define erealloc(ptr, size)					_erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -88,12 +88,6 @@ ZEND_METHOD(Closure, bind)
 		zend_error(E_WARNING, "Cannot bind an instance to a static closure");
 	}

-	if (newthis == NULL && !(closure->func.common.fn_flags & ZEND_ACC_STATIC)
-			&& closure->func.common.scope && closure->func.type == ZEND_INTERNAL_FUNCTION) {
-		zend_error(E_WARNING, "Cannot unbind $this of internal method");
-		return;
-	}
-
 	if (scope_arg != NULL) { /* scope argument was given */
 		if (IS_ZEND_STD_OBJECT(*scope_arg)) {
 			ce = Z_OBJCE_P(scope_arg);
@@ -133,19 +127,6 @@ ZEND_METHOD(Closure, bind)
 		ce = closure->func.common.scope;
 	}

-	/* verify that we aren't binding internal function to a wrong scope */
-	if (closure->func.type == ZEND_INTERNAL_FUNCTION && closure->func.common.scope != NULL) {
-		if (ce && !instanceof_function(ce, closure->func.common.scope TSRMLS_CC)) {
-			zend_error(E_WARNING, "Cannot bind function %s::%s to scope class %s", closure->func.common.scope->name, closure->func.common.function_name, ce->name);
-			return;
-		}
-		if (ce && newthis && (closure->func.common.fn_flags & ZEND_ACC_STATIC) == 0 &&
-				!instanceof_function(Z_OBJCE_P(newthis), closure->func.common.scope TSRMLS_CC)) {
-			zend_error(E_WARNING, "Cannot bind internal method %s::%s() to object of class %s", closure->func.common.scope->name, closure->func.common.function_name, Z_OBJCE_P(newthis)->name);
-			return;
-		}
-	}
-
 	zend_create_closure(return_value, &closure->func, ce, newthis TSRMLS_CC);
 }
 /* }}} */
@@ -167,12 +148,10 @@ ZEND_API zend_function *zend_get_closure_invoke_method(zval *obj TSRMLS_DC) /* {
 {
 	zend_closure *closure = (zend_closure *)zend_object_store_get_object(obj TSRMLS_CC);
 	zend_function *invoke = (zend_function*)emalloc(sizeof(zend_function));
-	const zend_uint keep_flags = ZEND_ACC_RETURN_REFERENCE | ZEND_ACC_VARIADIC;

 	invoke->common = closure->func.common;
 	invoke->type = ZEND_INTERNAL_FUNCTION;
-	invoke->internal_function.fn_flags =
-		ZEND_ACC_PUBLIC | ZEND_ACC_CALL_VIA_HANDLER | (closure->func.common.fn_flags & keep_flags);
+	invoke->internal_function.fn_flags = ZEND_ACC_PUBLIC | ZEND_ACC_CALL_VIA_HANDLER | (closure->func.common.fn_flags & ZEND_ACC_RETURN_REFERENCE);
 	invoke->internal_function.handler = ZEND_MN(Closure___invoke);
 	invoke->internal_function.module = 0;
 	invoke->internal_function.scope = zend_ce_closure;
@@ -464,7 +443,6 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent

 	closure->func = *func;
 	closure->func.common.prototype = NULL;
-	closure->func.common.fn_flags |= ZEND_ACC_CLOSURE;

 	if ((scope == NULL) && (this_ptr != NULL)) {
 		/* use dummy scope if we're binding an object without specifying a scope */
@@ -483,7 +461,19 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent
 		closure->func.op_array.run_time_cache = NULL;
 		(*closure->func.op_array.refcount)++;
 	} else {
-		if (!func->common.scope) {
+		/* verify that we aren't binding internal function to a wrong scope */
+		if(func->common.scope != NULL) {
+			if(scope && !instanceof_function(scope, func->common.scope TSRMLS_CC)) {
+				zend_error(E_WARNING, "Cannot bind function %s::%s to scope class %s", func->common.scope->name, func->common.function_name, scope->name);
+				scope = NULL;
+			}
+			if(scope && this_ptr && (func->common.fn_flags & ZEND_ACC_STATIC) == 0 &&
+					!instanceof_function(Z_OBJCE_P(this_ptr), closure->func.common.scope TSRMLS_CC)) {
+				zend_error(E_WARNING, "Cannot bind function %s::%s to object of class %s", func->common.scope->name, func->common.function_name, Z_OBJCE_P(this_ptr)->name);
+				scope = NULL;
+				this_ptr = NULL;
+			}
+		} else {
 			/* if it's a free function, we won't set scope & this since they're meaningless */
 			this_ptr = NULL;
 			scope = NULL;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -1931,11 +1931,8 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 			if (class_type->u.constant.type == IS_ARRAY) {
 				cur_arg_info->type_hint = IS_ARRAY;
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
 						cur_arg_info->allow_null = 1;
-					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
-						/* delay constant resolution and check to run-time */
-						cur_arg_info->allow_null = 0;
 					} else if (Z_TYPE(initialization->u.constant) != IS_ARRAY) {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with array type hint can only be an array or NULL");
 					}
@@ -1943,11 +1940,8 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 			} else if (class_type->u.constant.type == IS_CALLABLE) {
 				cur_arg_info->type_hint = IS_CALLABLE;
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
 						cur_arg_info->allow_null = 1;
-					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
-						/* delay constant resolution and check to run-time */
-						cur_arg_info->allow_null = 0;
 					} else {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with callable type hint can only be NULL");
 					}
@@ -1961,11 +1955,8 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 				cur_arg_info->class_name = Z_STRVAL(class_type->u.constant);
 				cur_arg_info->class_name_len = Z_STRLEN(class_type->u.constant);
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
 						cur_arg_info->allow_null = 1;
-					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
-						/* delay constant resolution and check to run-time */
-						cur_arg_info->allow_null = 0;
 					} else {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with a class type hint can only be NULL");
 					}
@@ -2214,18 +2205,6 @@ void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static
 			if (!CG(active_class_entry)) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot access self::class when no class scope is active");
 			}
-			if ((CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
-				zval_dtor(&class_name->u.constant);
-				constant_name.op_type = IS_CONST;
-				ZVAL_STRINGL(&constant_name.u.constant, "__CLASS__", sizeof("__CLASS__")-1, 1);
-				if (is_static) {
-					*result = constant_name;
-					result->u.constant.type = IS_CONSTANT;
-				} else {
-					zend_do_fetch_constant(result, NULL, &constant_name, ZEND_RT, 1 TSRMLS_CC);
-				}
-				break;
-			}
 			zval_dtor(&class_name->u.constant);
 			class_name->op_type = IS_CONST;
 			ZVAL_STRINGL(&class_name->u.constant, CG(active_class_entry)->name, CG(active_class_entry)->name_length, 1);
@@ -3252,8 +3231,8 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 		return 1;
 	}

-	/* If the prototype method is private do not enforce a signature */
-	if (proto->common.fn_flags & ZEND_ACC_PRIVATE) {
+	/* If both methods are private do not enforce a signature */
+    if ((fe->common.fn_flags & ZEND_ACC_PRIVATE) && (proto->common.fn_flags & ZEND_ACC_PRIVATE)) {
 		return 1;
 	}

@@ -3279,7 +3258,7 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 	 * go through all the parameters of the function and not just those present in the
 	 * prototype. */
 	num_args = proto->common.num_args;
-	if ((proto->common.fn_flags & ZEND_ACC_VARIADIC)
+	if ((fe->common.fn_flags & ZEND_ACC_VARIADIC)
 		&& fe->common.num_args > proto->common.num_args) {
 		num_args = fe->common.num_args;
 	}
@@ -3478,7 +3457,10 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{
 					if (precv && precv->opcode == ZEND_RECV_INIT && precv->op2_type != IS_UNUSED) {
 						zval *zv, zv_copy;
 						int use_copy;
-						zv = precv->op2.zv;
+						ALLOC_ZVAL(zv);
+						*zv = *precv->op2.zv;
+						zval_copy_ctor(zv);
+						INIT_PZVAL(zv);
 						if ((Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT) {
 							REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN_P(zv));
 							memcpy(offset, Z_STRVAL_P(zv), Z_STRLEN_P(zv));
@@ -3520,6 +3502,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{
 								zval_dtor(&zv_copy);
 							}
 						}
+						zval_ptr_dtor(&zv);
 					}
 				} else {
 					memcpy(offset, "NULL", 4);
@@ -3637,7 +3620,6 @@ static zend_bool do_inherit_property_access_check(HashTable *target_ht, zend_pro
 {
 	zend_property_info *child_info;
 	zend_class_entry *parent_ce = ce->parent;
-	TSRMLS_FETCH();

 	if (parent_info->flags & (ZEND_ACC_PRIVATE|ZEND_ACC_SHADOW)) {
 		if (zend_hash_quick_find(&ce->properties_info, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void **) &child_info)==SUCCESS) {
@@ -3670,8 +3652,7 @@ static zend_bool do_inherit_property_access_check(HashTable *target_ht, zend_pro
 		if ((child_info->flags & ZEND_ACC_PPP_MASK) > (parent_info->flags & ZEND_ACC_PPP_MASK)) {
 			zend_error_noreturn(E_COMPILE_ERROR, "Access level to %s::$%s must be %s (as in class %s)%s", ce->name, hash_key->arKey, zend_visibility_string(parent_info->flags), parent_ce->name, (parent_info->flags&ZEND_ACC_PUBLIC) ? "" : " or weaker");
 		} else if ((child_info->flags & ZEND_ACC_STATIC) == 0) {
-			/* Don't keep default properties in GC (thry may be freed by opcache) */
-			i_zval_ptr_dtor_nogc(ce->default_properties_table[parent_info->offset] ZEND_FILE_LINE_CC TSRMLS_CC);
+			zval_ptr_dtor(&(ce->default_properties_table[parent_info->offset]));
 			ce->default_properties_table[parent_info->offset] = ce->default_properties_table[child_info->offset];
 			ce->default_properties_table[child_info->offset] = NULL;
 			child_info->offset = parent_info->offset;
@@ -3983,7 +3964,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 	if (!strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) {
 		ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE;
 	} else if (!strncmp(mname, ZEND_CONSTRUCTOR_FUNC_NAME, mname_len)) {
-		if (ce->constructor && (!ce->parent || ce->constructor != ce->parent->constructor)) {
+		if (ce->constructor) {
 			zend_error_noreturn(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name);
 		}
 		ce->constructor = fe; fe->common.fn_flags |= ZEND_ACC_CTOR;
@@ -4010,7 +3991,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 		zend_str_tolower_copy(lowercase_name, ce->name, ce->name_length);
 		lowercase_name = (char*)zend_new_interned_string(lowercase_name, ce->name_length + 1, 1 TSRMLS_CC);
 		if (!memcmp(mname, lowercase_name, mname_len)) {
-			if (ce->constructor && (!ce->parent || ce->constructor != ce->parent->constructor)) {
+			if (ce->constructor) {
 				zend_error_noreturn(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name);
 			}
 			ce->constructor = fe;
@@ -4055,8 +4036,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 			}
 			zend_hash_quick_update(*overriden, arKey, nKeyLength, h, fn, sizeof(zend_function), (void**)&fn);
 			return;
-		} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT &&
-				(existing_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) == 0) {
+		} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
 			/* Make sure the trait method is compatible with previosly declared abstract method */
 			if (!zend_traits_method_compatibility_check(fn, existing_fn TSRMLS_CC)) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
@@ -4086,7 +4066,6 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 			/* inherited members are overridden by members inserted by traits */
 			/* check whether the trait method fulfills the inheritance requirements */
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
-			fn->common.prototype = NULL;
 		}
 	}

@@ -4105,7 +4084,7 @@ static int zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce TSRML
 		if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
 			ce->ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS;
 		}
-		if (fn->type == ZEND_USER_FUNCTION && fn->op_array.static_variables) {
+		if (fn->op_array.static_variables) {
 			ce->ce_flags |= ZEND_HAS_STATIC_IN_METHODS;
 		}
 	}
@@ -4217,7 +4196,6 @@ static void zend_check_trait_usage(zend_class_entry *ce, zend_class_entry *trait
 static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* {{{ */
 {
 	size_t i, j = 0;
-	zend_trait_precedence **precedences;
 	zend_trait_precedence *cur_precedence;
 	zend_trait_method_reference *cur_method_ref;
 	char *lcname;
@@ -4226,9 +4204,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 	/* resolve class references */
 	if (ce->trait_precedences) {
 		i = 0;
-		precedences = ce->trait_precedences;
-		ce->trait_precedences = NULL;
-		while ((cur_precedence = precedences[i])) {
+		while ((cur_precedence = ce->trait_precedences[i])) {
 			/** Resolve classes for all precedence operations. */
 			if (cur_precedence->exclude_from_classes) {
 				cur_method_ref = cur_precedence->trait_method;
@@ -4270,8 +4246,8 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*

 					/* make sure that the trait method is not from a class mentioned in
 					 exclude_from_classes, for consistency */
-					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[j]) {
-						zend_error(E_COMPILE_ERROR,
+					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[i]) {
+						zend_error_noreturn(E_COMPILE_ERROR,
 								   "Inconsistent insteadof definition. "
 								   "The method %s is to be used from %s, but %s is also on the exclude list",
 								   cur_method_ref->method_name,
@@ -4285,7 +4261,6 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 			}
 			i++;
 		}
-		ce->trait_precedences = precedences;
 	}

 	if (ce->trait_aliases) {
@@ -4353,20 +4328,16 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{
 	for (i = 0; i < ce->num_traits; i++) {
 		if (ce->trait_precedences) {
 			HashTable exclude_table;
-			zend_trait_precedence **precedences;

 			/* TODO: revisit this start size, may be its not optimal */
 			zend_hash_init_ex(&exclude_table, 2, NULL, NULL, 0, 0);

-			precedences = ce->trait_precedences;
-			ce->trait_precedences = NULL;
-			zend_traits_compile_exclude_table(&exclude_table, precedences, ce->traits[i]);
+			zend_traits_compile_exclude_table(&exclude_table, ce->trait_precedences, ce->traits[i]);

 			/* copies functions, applies defined aliasing, and excludes unused trait methods */
 			zend_hash_apply_with_arguments(&ce->traits[i]->function_table TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, ce, &overriden, &exclude_table);

 			zend_hash_destroy(&exclude_table);
-			ce->trait_precedences = precedences;
 		} else {
 			zend_hash_apply_with_arguments(&ce->traits[i]->function_table TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, ce, &overriden, NULL);
 		}
@@ -4374,17 +4345,6 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{

    zend_hash_apply_with_argument(&ce->function_table, (apply_func_arg_t)zend_fixup_trait_method, ce TSRMLS_CC);

-	if (ce->trait_precedences) {
-		i = 0;
-		while (ce->trait_precedences[i]) {
-			if (ce->trait_precedences[i]->exclude_from_classes) {
-				efree(ce->trait_precedences[i]->exclude_from_classes);
-				ce->trait_precedences[i]->exclude_from_classes = NULL;
-			}
-			i++;
-		}
-	}
-
 	if (overriden) {
 		zend_hash_destroy(overriden);
 		FREE_HASHTABLE(overriden);
@@ -5404,7 +5364,7 @@ ZEND_API int zend_unmangle_property_name_ex(const char *mangled_property, int le

 	*class_name = NULL;

-	if (!len || mangled_property[0] != 0) {
+	if (mangled_property[0]!=0) {
 		*prop_name = mangled_property;
 		if (prop_len) {
 			*prop_len = len;
@@ -5812,7 +5772,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con
 				opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC);
 			} else {
 				opline->extended_value = IS_CONSTANT_UNQUALIFIED;
-				if (check_namespace && CG(current_namespace)) {
+				if (CG(current_namespace)) {
 					opline->extended_value |= IS_CONSTANT_IN_NAMESPACE;
 					opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC);
 				} else {
@@ -5929,7 +5889,7 @@ void zend_do_add_array_element(znode *result, const znode *expr, const znode *of
 }
 /* }}} */

-void zend_do_add_static_array_element(zval *result, zval *offset, zval *expr) /* {{{ */
+void zend_do_add_static_array_element(zval *result, zval *offset, const zval *expr) /* {{{ */
 {
 	if (offset) {
 		switch (Z_TYPE_P(offset)) {
@@ -5940,9 +5900,6 @@ void zend_do_add_static_array_element(zval *result, zval *offset, zval *expr) /*
 			case IS_NULL:
 				zend_symtable_update(Z_ARRVAL_P(result), "", 1, &expr, sizeof(zval *), NULL);
 				break;
-			case IS_RESOURCE:
-				zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(offset), Z_LVAL_P(offset));
-				/* break missing intentionally */
 			case IS_LONG:
 			case IS_BOOL:
 				zend_hash_index_update(Z_ARRVAL_P(result), Z_LVAL_P(offset), &expr, sizeof(zval *), NULL);
@@ -5955,10 +5912,7 @@ void zend_do_add_static_array_element(zval *result, zval *offset, zval *expr) /*
 				break;
 		}
 	} else {
-		if (zend_hash_next_index_insert(Z_ARRVAL_P(result), &expr, sizeof(zval *), NULL) == FAILURE) {
-			zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
-			zval_ptr_dtor(&expr);
-		}
+		zend_hash_next_index_insert(Z_ARRVAL_P(result), &expr, sizeof(zval *), NULL);
 	}
 }
 /* }}} */
@@ -6383,15 +6337,6 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno
 		/* save the location of FETCH_W instruction(s) */
 		open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
 		zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC);
-
-		if (zend_is_function_or_method_call(array)) {
-			opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-			opline->opcode = ZEND_SEPARATE;
-			SET_NODE(opline->op1, array);
-			SET_UNUSED(opline->op2);
-			opline->result_type = IS_VAR;
-			opline->result.var = opline->op1.var;
-		}
 	} else {
 		is_variable = 0;
 		open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
@@ -6837,14 +6782,7 @@ void zend_do_extended_fcall_end(TSRMLS_D) /* {{{ */

 void zend_do_ticks(TSRMLS_D) /* {{{ */
 {
-	zend_op *opline;
-
-	/* This prevents a double TICK generated by the parser statement of "declare()" */
-	if (CG(active_op_array)->last && CG(active_op_array)->opcodes[CG(active_op_array)->last - 1].opcode == ZEND_TICKS) {
-		return;
-	}
-
-	opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+	zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);

 	opline->opcode = ZEND_TICKS;
 	SET_UNUSED(opline->op1);
@@ -7160,7 +7098,7 @@ void zend_do_begin_namespace(const znode *name, zend_bool with_bracket TSRMLS_DC
 }
 /* }}} */

-void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
+void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */
 {
 	char *lcname;
 	zval *name, *ns, tmp;
@@ -7187,7 +7125,7 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
 			ZVAL_STRING(name, p+1, 1);
 		} else {
 			ZVAL_ZVAL(name, ns, 1, 0);
-			warn = !CG(current_namespace);
+			warn = !is_global && !CG(current_namespace);
 		}
 	}

@@ -7243,7 +7181,7 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
 }
 /* }}} */

-void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC) /* {{{ */
+void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC) /* {{{ */
 {
 	char *lookup_name;
 	zval *name, *ns, tmp;
@@ -7264,7 +7202,7 @@ void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_function, zen
 			ZVAL_STRING(name, p+1, 1);
 		} else {
 			ZVAL_ZVAL(name, ns, 1, 0);
-			warn = !CG(current_namespace);
+			warn = !is_global && !CG(current_namespace);
 		}
 	}

@@ -7328,25 +7266,25 @@ void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_function, zen
 }
 /* }}} */

-void zend_do_use_function(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
+void zend_do_use_function(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */
 {
 	if (!CG(current_import_function)) {
 		CG(current_import_function) = emalloc(sizeof(HashTable));
 		zend_hash_init(CG(current_import_function), 0, NULL, ZVAL_PTR_DTOR, 0);
 	}

-	zend_do_use_non_class(ns_name, new_name, 1, 0, CG(current_import_function), CG(function_table) TSRMLS_CC);
+	zend_do_use_non_class(ns_name, new_name, is_global, 1, 0, CG(current_import_function), CG(function_table) TSRMLS_CC);
 }
 /* }}} */

-void zend_do_use_const(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
+void zend_do_use_const(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */
 {
 	if (!CG(current_import_const)) {
 		CG(current_import_const) = emalloc(sizeof(HashTable));
 		zend_hash_init(CG(current_import_const), 0, NULL, ZVAL_PTR_DTOR, 0);
 	}

-	zend_do_use_non_class(ns_name, new_name, 0, 1, CG(current_import_const), &CG(const_filenames) TSRMLS_CC);
+	zend_do_use_non_class(ns_name, new_name, is_global, 0, 1, CG(current_import_const), &CG(const_filenames) TSRMLS_CC);
 }
 /* }}} */

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -598,7 +598,7 @@ void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC);

 void zend_do_init_array(znode *result, const znode *expr, const znode *offset, zend_bool is_ref TSRMLS_DC);
 void zend_do_add_array_element(znode *result, const znode *expr, const znode *offset, zend_bool is_ref TSRMLS_DC);
-void zend_do_add_static_array_element(zval *result, zval *offset, zval *expr);
+void zend_do_add_static_array_element(zval *result, zval *offset, const zval *expr);
 void zend_do_list_init(TSRMLS_D);
 void zend_do_list_end(znode *result, znode *expr TSRMLS_DC);
 void zend_do_add_list_element(const znode *element TSRMLS_DC);
@@ -651,10 +651,10 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM
 void zend_do_begin_namespace(const znode *name, zend_bool with_brackets TSRMLS_DC);
 void zend_do_end_namespace(TSRMLS_D);
 void zend_verify_namespace(TSRMLS_D);
-void zend_do_use(znode *name, znode *new_name TSRMLS_DC);
-void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC);
-void zend_do_use_function(znode *name, znode *new_name TSRMLS_DC);
-void zend_do_use_const(znode *name, znode *new_name TSRMLS_DC);
+void zend_do_use(znode *name, znode *new_name, int is_global TSRMLS_DC);
+void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC);
+void zend_do_use_function(znode *name, znode *new_name, int is_global TSRMLS_DC);
+void zend_do_use_const(znode *name, znode *new_name, int is_global TSRMLS_DC);
 void zend_do_end_compilation(TSRMLS_D);
 void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC);

@@ -686,8 +686,6 @@ ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce TSRMLS_DC);
 ZEND_API void zend_cleanup_internal_classes(TSRMLS_D);
 ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
 ZEND_API int zend_cleanup_function_data_full(zend_function *function TSRMLS_DC);
-ZEND_API int clean_non_persistent_function_full(zend_function *function TSRMLS_DC);
-ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC);

 ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
 ZEND_API void zend_function_dtor(zend_function *function);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -36,24 +36,16 @@ ZEND_API void (*zend_throw_exception_hook)(zval *ex TSRMLS_DC);

 void zend_exception_set_previous(zval *exception, zval *add_previous TSRMLS_DC)
 {
-	zval *previous, *ancestor;
+	zval *previous;

 	if (exception == add_previous || !add_previous || !exception) {
 		return;
 	}
-	if (Z_TYPE_P(add_previous) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(add_previous), default_exception_ce TSRMLS_CC)) {
+	if (Z_TYPE_P(add_previous) != IS_OBJECT && !instanceof_function(Z_OBJCE_P(add_previous), default_exception_ce TSRMLS_CC)) {
 		zend_error(E_ERROR, "Cannot set non exception as previous exception");
 		return;
 	}
 	while (exception && exception != add_previous && Z_OBJ_HANDLE_P(exception) != Z_OBJ_HANDLE_P(add_previous)) {
-		ancestor = zend_read_property(default_exception_ce, add_previous, "previous", sizeof("previous")-1, 1 TSRMLS_CC);
-		while (Z_TYPE_P(ancestor) == IS_OBJECT) {
-			if (Z_OBJ_HANDLE_P(ancestor) == Z_OBJ_HANDLE_P(exception)) {
-				zval_ptr_dtor(&add_previous);
-				return;
-			}
-			ancestor = zend_read_property(default_exception_ce, ancestor, "previous", sizeof("previous")-1, 1 TSRMLS_CC);
-		}
 		previous = zend_read_property(default_exception_ce, exception, "previous", sizeof("previous")-1, 1 TSRMLS_CC);
 		if (Z_TYPE_P(previous) == IS_NULL) {
 			zend_update_property(default_exception_ce, exception, "previous", sizeof("previous")-1, add_previous TSRMLS_CC);
@@ -226,33 +218,6 @@ ZEND_METHOD(exception, __construct)
 }
 /* }}} */

-/* {{{ proto Exception::__wakeup()
-   Exception unserialize checks */
-#define CHECK_EXC_TYPE(name, type) \
-	value = zend_read_property(default_exception_ce, object, name, sizeof(name)-1, 1 TSRMLS_CC); \
-	if (value && Z_TYPE_P(value) != IS_NULL && Z_TYPE_P(value) != type) { \
-		zend_unset_property(default_exception_ce, object, name, sizeof(name)-1 TSRMLS_CC); \
-	}
-
-ZEND_METHOD(exception, __wakeup)
-{
-	zval *value;
-	zval *object = getThis();
-	CHECK_EXC_TYPE("message", IS_STRING);
-	CHECK_EXC_TYPE("string", IS_STRING);
-	CHECK_EXC_TYPE("code", IS_LONG);
-	CHECK_EXC_TYPE("file", IS_STRING);
-	CHECK_EXC_TYPE("line", IS_LONG);
-	CHECK_EXC_TYPE("trace", IS_ARRAY);
-	value = zend_read_property(default_exception_ce, object, "previous", sizeof("previous")-1, 1 TSRMLS_CC);
-	if (value && Z_TYPE_P(value) != IS_NULL && (Z_TYPE_P(value) != IS_OBJECT ||
-			!instanceof_function(Z_OBJCE_P(value), default_exception_ce TSRMLS_CC) ||
-			value == object)) {
-		zend_unset_property(default_exception_ce, object, "previous", sizeof("previous")-1 TSRMLS_CC);
-	}
-}
-/* }}} */
-
 /* {{{ proto ErrorException::__construct(string message, int code, int severity [, string filename [, int lineno [, Exception previous]]])
   ErrorException constructor */
 ZEND_METHOD(error_exception, __construct)
@@ -621,15 +586,11 @@ ZEND_METHOD(exception, getTraceAsString)
 	int res_len = 0, *len = &res_len, num = 0;

 	DEFAULT_0_PARAMS;
-
-	trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
-	if (Z_TYPE_P(trace) != IS_ARRAY) {
-		RETURN_FALSE;
-	}
-
+	
 	res = estrdup("");
 	str = &res;

+	trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
 	zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num);

 	s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
@@ -637,8 +598,8 @@ ZEND_METHOD(exception, getTraceAsString)
 	TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
 	efree(s_tmp);

-	res[res_len] = '\0';
-	RETURN_STRINGL(res, res_len, 0);
+	res[res_len] = '\0';	
+	RETURN_STRINGL(res, res_len, 0); 
 }
 /* }}} */

@@ -653,7 +614,6 @@ ZEND_METHOD(exception, getPrevious)
 	previous = zend_read_property(default_exception_ce, getThis(), "previous", sizeof("previous")-1, 1 TSRMLS_CC);
 	RETURN_ZVAL(previous, 1, 0);
 }
-/* }}} */

 int zend_spprintf(char **message, int max_len, const char *format, ...) /* {{{ */
 {
@@ -676,15 +636,15 @@ ZEND_METHOD(exception, __toString)
 	int len = 0;
 	zend_fcall_info fci;
 	zval fname;
-
+	
 	DEFAULT_0_PARAMS;
-
+	
 	str = estrndup("", 0);

 	exception = getThis();
 	ZVAL_STRINGL(&fname, "gettraceasstring", sizeof("gettraceasstring")-1, 1);

-	while (exception && Z_TYPE_P(exception) == IS_OBJECT && instanceof_function(Z_OBJCE_P(exception), default_exception_ce TSRMLS_CC)) {
+	while (exception && Z_TYPE_P(exception) == IS_OBJECT) {
 		prev_str = str;
 		_default_exception_get_entry(exception, "message", sizeof("message")-1, &message TSRMLS_CC);
 		_default_exception_get_entry(exception, "file", sizeof("file")-1, &file TSRMLS_CC);
@@ -694,7 +654,6 @@ ZEND_METHOD(exception, __toString)
 		convert_to_string(&file);
 		convert_to_long(&line);

-		trace = NULL;
 		fci.size = sizeof(fci);
 		fci.function_table = &Z_OBJCE_P(exception)->function_table;
 		fci.function_name = &fname;
@@ -707,7 +666,7 @@ ZEND_METHOD(exception, __toString)

 		zend_call_function(&fci, NULL TSRMLS_CC);

-		if (trace && Z_TYPE_P(trace) != IS_STRING) {
+		if (Z_TYPE_P(trace) != IS_STRING) {
 			zval_ptr_dtor(&trace);
 			trace = NULL;
 		}
@@ -728,11 +687,7 @@ ZEND_METHOD(exception, __toString)
 		zval_dtor(&file);
 		zval_dtor(&line);

-		Z_OBJPROP_P(exception)->nApplyCount++;
-		exception = zend_read_property(default_exception_ce, exception, "previous", sizeof("previous")-1, 1 TSRMLS_CC);
-		if (exception && Z_TYPE_P(exception) == IS_OBJECT && Z_OBJPROP_P(exception)->nApplyCount > 0) {
-			exception = NULL;
-		}
+		exception = zend_read_property(default_exception_ce, exception, "previous", sizeof("previous")-1, 0 TSRMLS_CC);

 		if (trace) {
 			zval_ptr_dtor(&trace);
@@ -741,17 +696,6 @@ ZEND_METHOD(exception, __toString)
 	}
 	zval_dtor(&fname);

-	/* Reset apply counts */
-	exception = getThis();
-	while (exception && Z_TYPE_P(exception) == IS_OBJECT && instanceof_function(Z_OBJCE_P(exception), default_exception_ce TSRMLS_CC)) {
-		if(Z_OBJPROP_P(exception)->nApplyCount) {
-			Z_OBJPROP_P(exception)->nApplyCount--;
-		} else {
-			break;
-		}
-		exception = zend_read_property(default_exception_ce, exception, "previous", sizeof("previous")-1, 1 TSRMLS_CC);
-	}
-
 	/* We store the result in the private property string so we can access
 	 * the result in uncaught exception handlers without memleaks. */
 	zend_update_property_string(default_exception_ce, getThis(), "string", sizeof("string")-1, str TSRMLS_CC);
@@ -779,7 +723,6 @@ ZEND_END_ARG_INFO()
 const static zend_function_entry default_exception_functions[] = {
 	ZEND_ME(exception, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	ZEND_ME(exception, __construct, arginfo_exception___construct, ZEND_ACC_PUBLIC)
-	ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC)
 	ZEND_ME(exception, getMessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	ZEND_ME(exception, getCode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	ZEND_ME(exception, getFile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
@@ -909,10 +852,11 @@ static void zend_error_va(int type, const char *file, uint lineno, const char *f
 ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* {{{ */
 {
 	zend_class_entry *ce_exception = Z_OBJCE_P(exception);
-	EG(exception) = NULL;
 	if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) {
 		zval *str, *file, *line;

+		EG(exception) = NULL;
+
 		zend_call_method_with_0_params(&exception, ce_exception, NULL, "__tostring", &str);
 		if (!EG(exception)) {
 			if (Z_TYPE_P(str) != IS_STRING) {
@@ -951,7 +895,6 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* {
 	} else {
 		zend_error(severity, "Uncaught exception '%s'", ce_exception->name);
 	}
-	zval_ptr_dtor(&exception);
 }
 /* }}} */

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -522,7 +522,9 @@ static void zend_assign_to_variable_reference(zval **variable_ptr_ptr, zval **va
 	zval *variable_ptr = *variable_ptr_ptr;
 	zval *value_ptr = *value_ptr_ptr;

-	if (variable_ptr != value_ptr) {
+	if (variable_ptr == &EG(error_zval) || value_ptr == &EG(error_zval)) {
+		variable_ptr_ptr = &EG(uninitialized_zval_ptr);
+	} else if (variable_ptr != value_ptr) {
 		if (!PZVAL_IS_REF(value_ptr)) {
 			/* break it away */
 			Z_DELREF_P(value_ptr);
@@ -606,22 +608,7 @@ ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend
 	return 0;
 }

-static int is_null_constant(zval *default_value TSRMLS_DC)
-{
-	if (IS_CONSTANT_TYPE(Z_TYPE_P(default_value))) {
-		zval constant = *default_value;
-		zval *constant_ptr = &constant;
-
-		zval_update_constant(&constant_ptr, 0 TSRMLS_CC);
-		if (Z_TYPE(constant) == IS_NULL) {
-			return 1;
-		}
-		zval_dtor(&constant);
-	}
-	return 0;
-}
-
-static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zval *arg, ulong fetch_type, zval *default_value TSRMLS_DC)
+static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zval *arg, ulong fetch_type TSRMLS_DC)
 {
 	zend_arg_info *cur_arg_info;
 	char *need_msg;
@@ -651,7 +638,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 			if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC)) {
 				return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name TSRMLS_CC);
 			}
-		} else if (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC)))) {
+		} else if (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null) {
 			need_msg = zend_verify_arg_class_kind(cur_arg_info, fetch_type, &class_name, &ce TSRMLS_CC);
 			return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "" TSRMLS_CC);
 		}
@@ -662,7 +649,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", "none", "" TSRMLS_CC);
 				}

-				if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC))))) {
+				if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "" TSRMLS_CC);
 				}
 				break;
@@ -671,7 +658,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 				if (!arg) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", "none", "" TSRMLS_CC);
 				}
-				if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL TSRMLS_CC) && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC))))) {
+				if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL TSRMLS_CC) && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "" TSRMLS_CC);
 				}
 				break;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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        |
@@ -364,6 +364,13 @@ void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC);

 ZEND_API void zend_fetch_dimension_by_zval(zval **result, zval *container, zval *dim TSRMLS_DC);

+#ifdef ZEND_WIN32
+void zend_init_timeout_thread(void);
+void zend_shutdown_timeout_thread(void);
+#define WM_REGISTER_ZEND_TIMEOUT		(WM_USER+1)
+#define WM_UNREGISTER_ZEND_TIMEOUT		(WM_USER+2)
+#endif
+
 #define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p))
 #define zendi_zval_dtor(p) zval_dtor(&(p))

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 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,10 +46,13 @@ ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0
 ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL };

 #ifdef ZEND_WIN32
-#ifdef ZTS
-__declspec(thread)
-#endif
-HANDLE tq_timer = NULL;
+#include <process.h>
+static WNDCLASS wc;
+static HWND timeout_window;
+static HANDLE timeout_thread_event;
+static HANDLE timeout_thread_handle;
+static DWORD timeout_thread_id;
+static int timeout_thread_initialized=0;
 #endif

 #if 0&&ZEND_DEBUG
@@ -106,7 +109,7 @@ static int clean_non_persistent_function(zend_function *function TSRMLS_DC) /* {
 }
 /* }}} */

-ZEND_API int clean_non_persistent_function_full(zend_function *function TSRMLS_DC) /* {{{ */
+static int clean_non_persistent_function_full(zend_function *function TSRMLS_DC) /* {{{ */
 {
 	return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
 }
@@ -118,7 +121,7 @@ static int clean_non_persistent_class(zend_class_entry **ce TSRMLS_DC) /* {{{ */
 }
 /* }}} */

-ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC) /* {{{ */
+static int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC) /* {{{ */
 {
 	return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
 }
@@ -826,10 +829,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 		if (EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) {
 			*fci->retval_ptr_ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC);
 		} else {
-			const zend_op *current_opline_before_exception = EG(opline_before_exception);
-
 			zend_execute(EG(active_op_array) TSRMLS_CC);
-			EG(opline_before_exception) = current_opline_before_exception;
 		}

 		if (!fci->symbol_table && EG(active_symbol_table)) {
@@ -1234,19 +1234,111 @@ ZEND_API void zend_timeout(int dummy) /* {{{ */
 /* }}} */

 #ifdef ZEND_WIN32
-VOID CALLBACK tq_timer_cb(PVOID arg, BOOLEAN timed_out)
+static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) /* {{{ */
 {
-	zend_bool *php_timed_out;
+	switch (message) {
+		case WM_DESTROY:
+			PostQuitMessage(0);
+			break;
+		case WM_REGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer, lParam is the timeout amount in seconds */
+			if (lParam == 0) {
+				KillTimer(timeout_window, wParam);
+			} else {
+#ifdef ZTS
+				void ***tsrm_ls;
+#endif
+				SetTimer(timeout_window, wParam, lParam*1000, NULL);
+#ifdef ZTS
+				tsrm_ls = ts_resource_ex(0, &wParam);
+				if (!tsrm_ls) {
+					/* shouldn't normally happen */
+					break;
+				}
+#endif
+				EG(timed_out) = 0;
+			}
+			break;
+		case WM_UNREGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer */
+			KillTimer(timeout_window, wParam);
+			break;
+		case WM_TIMER: {
+#ifdef ZTS
+				void ***tsrm_ls;

-	/* The doc states it'll be always true, however it theoretically
-		could be FALSE when the thread was signaled. */
-	if (!timed_out) {
+				tsrm_ls = ts_resource_ex(0, &wParam);
+				if (!tsrm_ls) {
+					/* Thread died before receiving its timeout? */
+					break;
+				}
+#endif
+				KillTimer(timeout_window, wParam);
+				EG(timed_out) = 1;
+			}
+			break;
+		default:
+			return DefWindowProc(hWnd, message, wParam, lParam);
+	}
+	return 0;
+}
+/* }}} */
+
+static unsigned __stdcall timeout_thread_proc(void *pArgs) /* {{{ */
+{
+	MSG message;
+
+	wc.style=0;
+	wc.lpfnWndProc = zend_timeout_WndProc;
+	wc.cbClsExtra=0;
+	wc.cbWndExtra=0;
+	wc.hInstance=NULL;
+	wc.hIcon=NULL;
+	wc.hCursor=NULL;
+	wc.hbrBackground=(HBRUSH)(COLOR_BACKGROUND + 5);
+	wc.lpszMenuName=NULL;
+	wc.lpszClassName = "Zend Timeout Window";
+	if (!RegisterClass(&wc)) {
+		return -1;
+	}
+	timeout_window = CreateWindow(wc.lpszClassName, wc.lpszClassName, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
+	SetEvent(timeout_thread_event);
+	while (GetMessage(&message, NULL, 0, 0)) {
+		SendMessage(timeout_window, message.message, message.wParam, message.lParam);
+		if (message.message == WM_QUIT) {
+			break;
+		}
+	}
+	DestroyWindow(timeout_window);
+	UnregisterClass(wc.lpszClassName, NULL);
+	SetEvent(timeout_thread_handle);
+	return 0;
+}
+/* }}} */
+
+void zend_init_timeout_thread(void) /* {{{ */
+{
+	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
+	timeout_thread_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
+	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
+	WaitForSingleObject(timeout_thread_event, INFINITE);
+}
+/* }}} */
+
+void zend_shutdown_timeout_thread(void) /* {{{ */
+{
+	if (!timeout_thread_initialized) {
 		return;
 	}
+	PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);

-	php_timed_out = (zend_bool *)arg;
-	*php_timed_out = 1;
+	/* Wait for thread termination */
+	WaitForSingleObject(timeout_thread_handle, 5000);
+	CloseHandle(timeout_thread_handle);
+	timeout_thread_initialized = 0;
 }
+/* }}} */
+
 #endif

 /* This one doesn't exists on QNX */
@@ -1264,28 +1356,13 @@ void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 	if(!seconds) {
 		return;
 	}
-
-        /* Don't use ChangeTimerQueueTimer() as it will not restart an expired
-		timer, so we could end up with just an ignored timeout. Instead
-		delete and recreate. */
-	if (NULL != tq_timer) {
-		if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) {
-			EG(timed_out) = 0;
-			tq_timer = NULL;
-			zend_error(E_ERROR, "Could not delete queued timer");
-			return;
-		}
-		tq_timer = NULL;
+	if (timeout_thread_initialized == 0 && InterlockedIncrement(&timeout_thread_initialized) == 1) {
+		/* We start up this process-wide thread here and not in zend_startup(), because if Zend
+		 * is initialized inside a DllMain(), you're not supposed to start threads from it.
+		 */
+		zend_init_timeout_thread();
 	}
-
-	/* XXX passing NULL means the default timer queue provided by the system is used */
-	if (!CreateTimerQueueTimer(&tq_timer, NULL, (WAITORTIMERCALLBACK)tq_timer_cb, (VOID*)&EG(timed_out), seconds*1000, 0, WT_EXECUTEONLYONCE)) {
-		EG(timed_out) = 0;
-		tq_timer = NULL;
-		zend_error(E_ERROR, "Could not queue new timer");
-		return;
-	}
-	EG(timed_out) = 0;
+	PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
 #else
 #	ifdef HAVE_SETITIMER
 	{
@@ -1327,16 +1404,9 @@ void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 void zend_unset_timeout(TSRMLS_D) /* {{{ */
 {
 #ifdef ZEND_WIN32
-	if (NULL != tq_timer) {
-		if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) {
-			EG(timed_out) = 0;
-			tq_timer = NULL;
-			zend_error(E_ERROR, "Could not delete queued timer");
-			return;
-		}
-		tq_timer = NULL;
+	if(timeout_thread_initialized) {
+		PostThreadMessage(timeout_thread_id, WM_UNREGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) 0);
 	}
-	EG(timed_out) = 0;
 #else
 #	ifdef HAVE_SETITIMER
 	if (EG(timeout_seconds)) {
@@ -1586,12 +1656,15 @@ ZEND_API void zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */
 				/*printf("Cache miss!  Initialized %x\n", EG(active_symbol_table));*/
 			}
 			ex->symbol_table = EG(active_symbol_table);
+
+			if (ex->op_array->this_var != -1 &&
+			    !*EX_CV_NUM(ex, ex->op_array->this_var) &&
+			    EG(This)) {
+			    *EX_CV_NUM(ex, ex->op_array->this_var) = (zval**)EX_CV_NUM(ex, ex->op_array->last_var + ex->op_array->this_var);
+				**EX_CV_NUM(ex, ex->op_array->this_var) = EG(This);
+ 			}
 			for (i = 0; i < ex->op_array->last_var; i++) {
 				if (*EX_CV_NUM(ex, i)) {
-					if (UNEXPECTED(**EX_CV_NUM(ex, i) == &EG(uninitialized_zval))) {
-						Z_DELREF(EG(uninitialized_zval));
-						ALLOC_INIT_ZVAL(**EX_CV_NUM(ex, i));
-					}
 					zend_hash_quick_update(EG(active_symbol_table),
 						ex->op_array->vars[i].name,
 						ex->op_array->vars[i].name_len + 1,
Author	SHA1	Message	Date
Ferenc Kovacs	fc1df8e7a6	removing the NEWS entry for #41631 as we reverted the fix for now	2014-08-27 15:31:35 +02:00
Ferenc Kovacs	030a84a3f0	Revert "Merge branch 'PHP-5.5' into PHP-5.6" This reverts commit `98e67add15`, reversing changes made to `2cdc1a2b74`.	2014-08-27 15:28:06 +02:00
Ferenc Kovacs	8553a9f10c	Revert "fix TS build" This reverts commit `84a4041ba4`.	2014-08-27 15:27:57 +02:00
Ferenc Kovacs	8a14180422	reworked NEWS for 5.6.0GA	2014-08-27 10:55:37 +02:00
Ferenc Kovacs	48a9cea762	update the GIT-RULES with the 5.6 and the release branches	2014-08-27 05:16:41 +02:00
Ferenc Kovacs	97f01febca	better heading for UPGRADING.INTERNALS	2014-08-27 05:16:23 +02:00
Ferenc Kovacs	d8db82231e	remove the -dev suffix from the Zend version	2014-08-27 05:15:58 +02:00
Tjerk Meesters	7db10e43ac	Some changes were lost in the merge commit of #66091	2014-08-27 05:10:34 +02:00
Ferenc Kovacs	5a1ff3bf50	bump versions to stable	2014-08-27 05:00:14 +02:00
Ferenc Kovacs	b0cb9341bd	add the final NEWS entry for 5.6.0	2014-08-27 04:56:51 +02:00
Remi Collet	d7d7d23fcf	Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597 Incomplete fix for CVE-2014-4049 Check possible buffer overflow - pass real buffer end to dn_expand calls - check buffer len before each read	2014-08-27 04:36:57 +02:00
Stanislav Malyshev	7325578bba	fix potentially missing NUL termination	2014-08-27 04:36:44 +02:00
Ferenc Kovacs	2c27515409	improve the grammar for my recent UPGRADING note	2014-08-27 04:35:23 +02:00
Ferenc Kovacs	4b3de4dae1	mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING see the discussion on the mailing list and in the pull request for details: https://github.com/php/php-src/pull/733	2014-08-27 04:35:12 +02:00
Remi Collet	77b09bfc35	Fix bug #67716 - Segfault in cdf.c	2014-08-27 04:31:44 +02:00
Lior Kaplan	b6a63b285c	Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>	2014-08-27 04:29:44 +02:00
Stanislav Malyshev	c9da6430d3	Fix bug #67730 - Null byte injection possible with imagexxx functions	2014-08-27 04:29:28 +02:00
Ferenc Kovacs	d18dd11cbd	Revert "Fixed Bug #67724 " This reverts commit `e4ff7f2ee3`.	2014-08-27 04:28:14 +02:00
Tjerk Meesters	e60d39581a	Fixed #67694 : Regression in session_regenerate_id()	2014-08-27 04:27:26 +02:00
Ferenc Kovacs	7ac17d0d79	bump to RC4	2014-08-14 02:54:13 +02:00
Ferenc Kovacs	b6aace4592	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (60 commits) new NEWS block for the next release Updated NEWS for #66091 Updated NEWS for #66091 Fixed #66091 updated NEWS updated NEWS updated NEWS backported the fix for bug #41577 fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) NEWS entry for `e6d93a1` / `d73d44c` restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 Revert "Merge branch 'pull-request/694' into PHP-5.6" Add __debugInfo() to UPGRADING. fix TS build Update NEWS Update NEWS Update NEWS Bug #41631: Observe socket read timeouts in SSL streams wrap int8_t and int16_t with #ifdef to avoid possible clashes ... Conflicts: NEWS	2014-08-14 02:24:20 +02:00
Ferenc Kovacs	cbfc5abc3f	bump to RC3	2014-07-30 11:52:04 +02:00
Ferenc Kovacs	d8116ee400	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (164 commits) add missing entry to NEWS add missing entries to NEWS add NEWS block for the next RC NEWS entry for #67713 update the exception message to better match the actual check ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct() Fixed usage after free Undo inadvertent commit of php_version Corrected patch for bug #60616 Wildcards should only be used in the first name component; fixed comment style Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields) fix SOAP for uninitialzed object fix NEWS Fix missing type checks in various functions Fix SPL objects initialization checks Add object initialization checks for sqlite3 classes Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg. update NEWS Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting) Fixed Bug #67538 (SPL Iterators use-after-free) ... Conflicts: NEWS	2014-07-30 11:50:47 +02:00
Ferenc Kovacs	2d4b95e0e2	bump the version to RC2	2014-07-02 02:23:22 +02:00
Ferenc Kovacs	a0be642ecf	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (70 commits) add some missing NEWS entries NEWS block for 5.6.0RC3 Fix ext/pgsql builds with libpq < 7.3. updated libs_version.txt updated libs_version.txt updated libmagic.patch in 5.6+ updated libmagic.patch Fixed possible crash because of race conditions on modifying constants in shared memory remove the NEWS entry for the reverted fpm fix remove the NEWS entry for the reverted fpm fix remove the NEWS entry for the reverted fpm fix Revert "Fix Bug #67530 error_log=syslog ignored" --enable-fpm for the travis build fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here NEWS NEWS Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0 adding NEWS entry for the fix for bug #65641 Updated NEWS file for recent phpdbg fixes Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent ... Conflicts: NEWS	2014-07-02 02:21:53 +02:00
Ferenc Kovacs	6c80e90e23	5.6.0RC1	2014-06-19 02:42:55 +02:00
Ferenc Kovacs	a4e23ef8a3	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (117 commits) add missing entry to NEWS add missing entry to NEWS add NEWS block for 5.6.0RC2 Add support for gb18030/MySQL 5.7 Fix another problem with MySQL 5.7 new test, missing in `ea466a3` Suppress test failure with MySQL 5.7 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 NEWS Fix Request #67453 Allow to unserialize empty data. Update copyright year to 2014 Update copyright year for re2c generated files Update copyright year to 2014 Update copyright year for re2c files as well Fix patch for bug #67436 ... Conflicts: NEWS	2014-06-19 02:42:32 +02:00
Ferenc Kovacs	69797e81ed	PHP-5.6.0beta4	2014-06-04 03:22:06 +02:00
Ferenc Kovacs	4ed1713789	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (51 commits) Fix tests Fix possible segfault depending on memory location... fix gcov data with some locales (again) Update NEWS Fixed startup segfault in non-debug builds Fixes issue #87 Fixed regression introduced by patch for bug #67072 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files (re)add cve number in NEWS, from 5.4.29 NEWS NEWS NEWS Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check add NEWS block for 5.6.0RC1 Update NEWs Update NEWs Fixed bug #67359 (Segfault in recursiveDirectoryIterator) Check for zero-length keys in spl_array_skip_protected and don't skip them. added CVEs in NEWS updated libmagic.patch for 5.6+ updated libmagic.patch for 5.4+ ... Conflicts: NEWS	2014-06-04 03:22:00 +02:00
Ferenc Kovacs	57e698d582	5.6.0beta3	2014-05-14 09:58:22 +02:00
Ferenc Kovacs	7e35e8b9ef	5.6.0beta3	2014-05-14 09:57:23 +02:00
Ferenc Kovacs	a2edb3e7e4	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (56 commits) adding NEWS block for beta4 5.4.30 next enable email notifications update NEWS update NEWS update NEWS - Updated to version 2014.3 (2014c) fix test - output can be chunked fix test Fixed test for commit `997be125eb` Add bug fix to NEWS Update UPGRADING according to bug fix improve CURL tests to allow testing without separate server Fixed bug #67199 mb_regex_encoding mishmash fix bug #67253: timelib_meridian_with_check out-of-bounds read Fix bug #67252: convert_uudecode out-of-bounds read Fix bug #67251 - date_parse_from_format out-of-bounds read Fix bug #67250 (iptcparse out-of-bounds read) Fix bug #67248 (imageaffinematrixget missing check of parameters) Fix bug #67247 spl_fixedarray_resize integer overflow ... Conflicts: NEWS	2014-05-14 09:56:02 +02:00
Ferenc Kovacs	a964242f19	5.6.0beta2	2014-05-01 16:42:03 +02:00
Ferenc Kovacs	ce20287810	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (271 commits) one heading is enough add new NEWS block for alpha3 XFAIL the leaking multibyte tests, we should really get to the bottom of this Fixed numbering in UPGRADING file Updated NEWS for fixed phpdbg issue #85 Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85 add missing NEWS entry to the correct release where it was added 5.5.12 was released yesterday add missing NEWS entry to the correct release where it was added Updated NEWS entry for phpdbg add missing NEWS entry to the correct release where it was added add some missing NEWS entries fix test locality inconsitency BFN fix bug #64247 (CURLOPT_INFILE doesn't allow reset) Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros Fix bug #67060: use default mode of 660 separate travis jobs for debug and non-debug builds separate travis jobs for TS and NTS builds put this test back to XFAIL, as it was before, since it is still leaking memory ... Conflicts: NEWS	2014-05-01 16:40:20 +02:00
Ferenc Kovacs	11d102ebbc	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: fix typo fix typo fix typo	2014-04-10 07:11:48 +02:00
Ferenc Kovacs	eb44463e35	5.6.0beta1	2014-04-10 06:49:31 +02:00
Ferenc Kovacs	b3b1c0b63d	remove the beta2 news block as we don't need that in the release tag	2014-04-10 06:47:25 +02:00
Ferenc Kovacs	8871aa912f	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (240 commits) add a NEWS block for beta2 add missing entries to NEWS abstract namespace for unix sockets is a linux only feature Don't test for specific non-zero substr_compare() return value Add only_integer_keys option to zend_hash_reindex Don't always separate splice replacement array Add zend_hash_splice Add zend_hash_reindex Remove some usages of hashtable internals Updated NEWS fixed bug66702 : regexiterator's invert flag doesn't work as expected Updated NEWS for #67043 Fixed bug 67043 cleanup Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret updated libs versions fixed the test for ICI >= 52.1 Fix Linux specific fail in error traces Linux apparently does not like memcpy in overlapping regions... add missing skip to the output, so we actually skip this test fix the test according to how new date code does it ...	2014-04-10 06:45:31 +02:00
Ferenc Kovacs	dae8ff251c	5.6.0alpha3	2014-02-27 02:36:56 +01:00
Ferenc Kovacs	79bfef5ba3	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (136 commits) fix tests broken by `633f898f15` add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry Deprecate CN_match in favor of peer_name in SSL contexts Remove cURL close policy related constants Update stack size in tests/func/010.phpt Don't add num_additional_args in SEND opcodes Disallow use of positional args after unpacking Store arg_num in fcall entry Introduce zend_function_call_entry structure move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged rearrange the NEWS blocks a bit add NEWS block for 5.6.0 beta1 restored that test part in ext/openssl to enable notify/wait remove echo fix stdin reading in new openssl tests ...	2014-02-27 02:35:58 +01:00
Ferenc Kovacs	326ab8b147	5.6.0alpha2	2014-02-12 09:45:18 +01:00
Ferenc Kovacs	99bd2fd9c4	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (97 commits) update the alpha2 release date Fixed ZTS and added fix to NEWS. Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too. Rename timelib_get_zone to timelib_parse_zone and export. fix regex to detect valgrind version New PCRE version got stricter fix regex to detect valgrind version New PCRE version got stricter Fixed memory leak in pow operator 5.5.9 now released Added information in NEWS and UPGRADING add T_POW (**) operator add NEWS block for 5.6.0alpha3 updated libs_version.txt updated libs_version.txt update libs_version.txt more tests for ICU >= 52.1 compat fix tests for ICU >= 52.1 Fix year adapt test to curl 7.35.0 upgrade move the NEWS entry into the right section Fixed SNI failure from missing Z_STRVAL_PP ...	2014-02-12 06:43:05 +01:00
Ferenc Kovacs	1f148f7ad9	Revert "5.6.0alpha1" This reverts commit `8648f76bac`.	2014-02-06 03:55:53 +01:00
Ferenc Kovacs	8648f76bac	5.6.0alpha1	2014-01-21 02:30:07 +01:00