sync NEWS

bump version
Merge branch 'master' into PHP-7.0.0
2026-11-09 18:20:50 +00:00 · 2015-09-02 22:12:15 +02:00 · 2015-09-02 22:10:25 +02:00 · 2015-09-02 22:08:24 +02:00 · 2015-08-18 21:04:33 +02:00 · 2015-08-18 21:02:53 +02:00
2334 changed files with 46682 additions and 124156 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
@@ -148,7 +148,6 @@ tests/*/*/*.sh
 */tests/*/*/*.sh
 */*/tests/*.diff
 */*/tests/*.out
-*/*/tests/*.out.png
 */*/tests/*.php
 */*/tests/*.exp
 */*/tests/*.log
@@ -246,6 +245,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,22 +1,4 @@
 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
-      - libsasl2-dev
-      - libxpm-dev
-      - libt1-dev

 notifications:
    email: 
@@ -45,6 +27,13 @@ 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 libsasl2-dev libxpm-dev libt1-dev libc-client2007e-dev
+    - sudo cp ./travis/de /var/lib/locales/supported.d/de
+    - sudo dpkg-reconfigure locales
+    - ./travis/install.sh
+
 before_script:
    # Compile PHP
    - ./travis/compile.sh
@@ -54,6 +43,7 @@ before_script:
    - . ./travis/ext/pdo_mysql/setup.sh
    - . ./travis/ext/pgsql/setup.sh
    - . ./travis/ext/pdo_pgsql/setup.sh
+    - . ./travis/ext/imap/setup.sh

 # Run PHPs run-tests.php 
 script:
@@ -178,7 +178,7 @@ Internal Function Naming Convensions
    Unexposed module function should be static and should not be defined in
    'php_modulename.h'.

-    static int php_session_destroy()
+    static int php_session_destroy(TSRMLS_D)

 2.  Main module source file must be named 'modulename.c'.

@@ -108,8 +108,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
 -------------------------------------------------------------------------------
@@ -132,7 +132,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
@@ -5,6 +5,7 @@ Installing PHP

     * General Installation Considerations
     * Installation on Unix systems
+          + Apache 1.3.x on Unix systems
          + Apache 2.x on Unix systems
          + Lighttpd 1.4 on Unix systems
          + Sun, iPlanet and Netscape servers on Sun Solaris
@@ -102,6 +103,7 @@ Installation on Unix systems

 Table of Contents

+     * Apache 1.3.x on Unix systems
     * Apache 2.x on Unix systems
     * Lighttpd 1.4 on Unix systems
     * Sun, iPlanet and Netscape servers on Sun Solaris
@@ -161,6 +163,208 @@ Table of Contents
   you can't figure out why, see the Problems section.
     __________________________________________________________________

+Apache 1.3.x on Unix systems
+
+   This  section  contains  notes and hints specific to Apache installs of
+   PHP on Unix platforms. We also have instructions and notes for Apache 2
+   on a separate page.
+
+   You  can select arguments to add to the configure on line 10 below from
+   the  list of core configure options and from extension specific options
+   described  at  the respective places in the manual. The version numbers
+   have  been  omitted here, to ensure the instructions are not incorrect.
+   You  will  need  to replace the 'xxx' here with the correct values from
+   your files.
+
+   Example #1 Installation Instructions (Apache Shared Module Version) for
+   PHP
+1.  gunzip apache_xxx.tar.gz
+2.  tar -xvf apache_xxx.tar
+3.  gunzip php-xxx.tar.gz
+4.  tar -xvf php-xxx.tar
+5.  cd apache_xxx
+6.  ./configure --prefix=/www --enable-module=so
+7.  make
+8.  make install
+9.  cd ../php-xxx
+
+10. Now, configure your PHP.  This is where you customize your PHP
+    with various options, like which extensions will be enabled.  Do a
+    ./configure --help for a list of available options.  In our example
+    we'll do a simple configure with Apache 1 and MySQL support.  Your
+    path to apxs may differ from our example.
+
+      ./configure --with-mysql --with-apxs=/www/bin/apxs
+
+11. make
+12. make install
+
+    If you decide to change your configure options after installation,
+    you only need to repeat the last three steps. You only need to
+    restart apache for the new module to take effect. A recompile of
+    Apache is not needed.
+
+    Note that unless told otherwise, 'make install' will also install PEAR,
+    various PHP tools such as phpize, install the PHP CLI, and more.
+
+13. Setup your php.ini file:
+
+      cp php.ini-development /usr/local/lib/php.ini
+
+    You may edit your .ini file to set PHP options.  If you prefer your
+    php.ini in another location, use --with-config-file-path=/some/path in
+    step 10.
+
+    If you instead choose php.ini-production, be certain to read the list
+    of changes within, as they affect how PHP behaves.
+
+14. Edit your httpd.conf to load the PHP module.  The path on the right hand
+    side of the LoadModule statement must point to the path of the PHP
+    module on your system.  The make install from above may have already
+    added this for you, but be sure to check.
+
+      LoadModule php7_module libexec/libphp7.so
+
+15. And in the AddModule section of httpd.conf, somewhere under the
+    ClearModuleList, add this:
+
+      AddModule mod_php7.c
+
+16. Tell Apache to parse certain extensions as PHP.  For example,
+    let's have Apache parse the .php extension as PHP.  You could
+    have any extension(s) parse as PHP by simply adding more, with
+    each separated by a space.  We'll add .phtml to demonstrate.
+
+      AddType application/x-httpd-php .php .phtml
+
+    It's also common to setup the .phps extension to show highlighted PHP
+    source, this can be done with:
+
+      AddType application/x-httpd-php-source .phps
+
+17. Use your normal procedure for starting the Apache server. (You must
+    stop and restart the server, not just cause the server to reload by
+    using a HUP or USR1 signal.)
+
+   Alternatively, to install PHP as a static object:
+
+   Example  #2  Installation  Instructions (Static Module Installation for
+   Apache) for PHP
+1.  gunzip -c apache_1.3.x.tar.gz | tar xf -
+2.  cd apache_1.3.x
+3.  ./configure
+4.  cd ..
+
+5.  gunzip -c php-5.x.y.tar.gz | tar xf -
+6.  cd php-5.x.y
+7.  ./configure --with-mysql --with-apache=../apache_1.3.x
+8.  make
+9.  make install
+
+10. cd ../apache_1.3.x
+
+11. ./configure --prefix=/www --activate-module=src/modules/php7/libphp7.a
+    (The above line is correct! Yes, we know libphp7.a does not exist at this
+    stage. It isn't supposed to. It will be created.)
+
+12. make
+    (you should now have an httpd binary which you can copy to your Apache bin d
+ir if
+    it is your first install then you need to "make install" as well)
+
+13. cd ../php-5.x.y
+14. cp php.ini-development /usr/local/lib/php.ini
+
+15. You can edit /usr/local/lib/php.ini file to set PHP options.
+    Edit your httpd.conf or srm.conf file and add:
+    AddType application/x-httpd-php .php
+
+   Depending  on  your  Apache  install  and  Unix variant, there are many
+   possible  ways  to  stop and restart the server. Below are some typical
+   lines   used  in  restarting  the  server,  for  different  apache/unix
+   installations.  You  should  replace  /path/to/  with the path to these
+   applications on your systems.
+
+   Example #3 Example commands for restarting Apache
+1. Several Linux and SysV variants:
+/etc/rc.d/init.d/httpd restart
+
+2. Using apachectl scripts:
+/path/to/apachectl stop
+/path/to/apachectl start
+
+3. httpdctl and httpsdctl (Using OpenSSL), similar to apachectl:
+/path/to/httpsdctl stop
+/path/to/httpsdctl start
+
+4. Using mod_ssl, or another SSL server, you may want to manually
+stop and start:
+/path/to/apachectl stop
+/path/to/apachectl startssl
+
+   The  locations of the apachectl and http(s)dctl binaries often vary. If
+   your  system  has locate or whereis or which commands, these can assist
+   you in finding your server control programs.
+
+   Different examples of compiling PHP for apache are as follows:
+./configure --with-apxs --with-pgsql
+
+   This will create a libphp7.so shared library that is loaded into Apache
+   using  a  LoadModule  line  in Apache's httpd.conf file. The PostgreSQL
+   support is embedded into this library.
+
+./configure --with-apxs --with-pgsql=shared
+
+   This  will  create  a libphp7.so shared library for Apache, but it will
+   also create a pgsql.so shared library that is loaded into PHP either by
+   using  the  extension  directive  in  php.ini  file  or  by  loading it
+   explicitly in a script using the dl() function.
+
+./configure --with-apache=/path/to/apache_source --with-pgsql
+
+   This  will  create  a  libmodphp7.a  library,  a  mod_php7.c  and  some
+   accompanying files and copy this into the src/modules/php7 directory in
+   the    Apache    source   tree.   Then   you   compile   Apache   using
+   --activate-module=src/modules/php7/libphp7.a   and   the  Apache  build
+   system  will  create  libphp7.a  and  link it statically into the httpd
+   binary.  The  PostgreSQL  support  is included directly into this httpd
+   binary, so the final result here is a single httpd binary that includes
+   all of Apache and all of PHP.
+
+./configure --with-apache=/path/to/apache_source --with-pgsql=shared
+
+   Same as before, except instead of including PostgreSQL support directly
+   into  the  final  httpd you will get a pgsql.so shared library that you
+   can load into PHP from either the php.ini file or directly using dl().
+
+   When  choosing  to build PHP in different ways, you should consider the
+   advantages  and  drawbacks  of each method. Building as a shared object
+   will  mean  that  you  can compile apache separately, and don't have to
+   recompile  everything  as you add to, or change, PHP. Building PHP into
+   apache  (static  method)  means  that PHP will load and run faster. For
+   more information, see the Apache » web page on DSO support.
+
+     Note:
+
+     Apache's  default  httpd.conf  currently  ships  with a section that
+     looks like this:
+
+User nobody
+Group "#-1"
+
+     Unless  you  change  that  to "Group nogroup" or something like that
+     ("Group  daemon"  is  also very common) PHP will not be able to open
+     files.
+
+     Note:
+
+     Make  sure  you  specify  the  installed  version of apxs when using
+     --with-apxs=/path/to/apxs  .  You must NOT use the apxs version that
+     is  in  the apache sources but the one that is actually installed on
+     your system.
+     __________________________________________________________________
+     __________________________________________________________________
+
 Apache 2.x on Unix systems

   This  section  contains notes and hints specific to Apache 2.x installs
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2016 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2015 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"`; \
@@ -172,7 +172,7 @@ PHP_FUNCTION(module_name_drawtext)
    zval *image = NULL;
    zval *font = NULL;

-    if (zend_parse_parameters(argc, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
+    if (zend_parse_parameters(argc TSRMLS_CC, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
        return;

    if (image) {
@@ -8,98 +8,98 @@ API adjustment to the old output control code:

 	Checking output control layers status:
 		// Using OG()
-		php_output_get_status();
+		php_output_get_status(TSRMLS_C);

 	Starting the default output handler:
-		// php_start_ob_buffer(NULL, 0, 1);
-		php_output_start_default();
+		// php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
+		php_output_start_default(TSRMLS_C);

 	Starting an user handler by zval:
-		// php_start_ob_buffer(zhandler, chunk_size, erase);
-		php_output_start_user(zhandler, chunk_size, flags);
+		// php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC);
+		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);

 	Starting an internal handler whithout context:
-		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase);
-		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags);
+		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase TSRMLS_CC);
+		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags TSRMLS_CC);

 	Starting an internal handler with context:
 		// not possible with old API
 		php_output_handler *h;
-		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags);
+		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC);
 		php_output_handler_set_context(h, my_context, my_context_dtor);
-		php_output_handler_start(h);
+		php_output_handler_start(h TSRMLS_CC);

 	Testing whether a certain output handler has already been started:
-		// php_ob_handler_used("output handler name");
-		php_output_handler_started(handler_name, handler_name_len);
+		// php_ob_handler_used("output handler name" TSRMLS_CC);
+		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);

 	Flushing one output buffer:
-		// php_end_ob_buffer(1, 1);
-		php_output_flush();
+		// php_end_ob_buffer(1, 1 TSRMLS_CC);
+		php_output_flush(TSRMLS_C);

 	Flushing all output buffers:
 		// not possible with old API
-		php_output_flush_all();
+		php_output_flush_all(TSRMLS_C);

 	Cleaning one output buffer:
-		// php_ob_end_buffer(0, 1);
-		php_output_clean();
+		// php_ob_end_buffer(0, 1 TSRMLS_CC);
+		php_output_clean(TSRMLS_C);

 	Cleaning all output buffers:
 		// not possible with old API
-		php_output_clean_all();
+		php_output_clean_all(TSRMLS_C);

 	Discarding one output buffer:
-		// php_ob_end_buffer(0, 0);
-		php_output_discard();
+		// php_ob_end_buffer(0, 0 TSRMLS_CC);
+		php_output_discard(TSRMLS_C);

 	Discarding all output buffers:
-		// php_ob_end_buffers(0);
-		php_output_discard_all();
+		// php_ob_end_buffers(0 TSRMLS_CC);
+		php_output_discard_all(TSRMLS_C);

 	Stopping (and dropping) one output buffer:
-		// php_ob_end_buffer(1, 0)
-		php_output_end();
+		// php_ob_end_buffer(1, 0 TSRMLS_CC)
+		php_output_end(TSRMLS_C);

 	Stopping (and dropping) all output buffers:
-		// php_ob_end_buffers(1, 0);
-		php_output_end_all();
+		// php_ob_end_buffers(1, 0 TSRMLS_CC);
+		php_output_end_all(TSRMLS_C);

 	Retrieving output buffers contents:
-		// php_ob_get_buffer(zstring);
-		php_output_get_contents(zstring);
+		// php_ob_get_buffer(zstring TSRMLS_CC);
+		php_output_get_contents(zstring TSRMLS_CC);

 	Retrieving output buffers length:
-		// php_ob_get_length(zlength);
-		php_output_get_length(zlength);
+		// php_ob_get_length(zlength TSRMLS_CC);
+		php_output_get_length(zlength TSRMLS_CC);

 	Retrieving output buffering level:
 		// OG(nesting_level);
-		php_output_get_level();
+		php_output_get_level(TSRMLS_C);

 	Issue a warning because of an output handler conflict:
-		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name");
-		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len);
+		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC);
+		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len TSRMLS_CC);

 	Registering a conflict checking function, which will be checked prior starting the handler:
 		// not possible with old API, unless hardcoding into output.c
-		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t);
+		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);

 	Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler:
 		// not possible with old API
-		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t);
+		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);

 	Facilitating a context from within an output handler callable with ob_start():
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC);

 	Disabling of the output handler by itself:
 		//not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC);

 	Marking an output handler immutable by itself because of irreversibility of its operation:
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);

 	Restarting the output handler because of a CLEAN operation:
 		// not possible with old API
@@ -13,8 +13,8 @@ meaningful error messages.
 Prototypes
 ----------
 /* Implemented. */
-int zend_parse_parameters(int num_args, char *type_spec, ...);
-int zend_parse_parameters_ex(int flags, int num_args, char *type_spec, ...);
+int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
+int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);

 The zend_parse_parameters() function takes the number of parameters
 passed to the extension function, the type specifier string, and the
@@ -30,7 +30,7 @@ resources cannot be auto-converted.

 PHP 5.5 includes a new function:

-int zend_parse_parameter(int flags, int arg_num, zval **arg, const char *spec, ...);
+int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...);

 This function behaves like zend_parse_parameters_ex() except that instead of
 reading the arguments from the stack, it receives a single zval to convert
@@ -63,10 +63,10 @@ Type specifiers
 o  - object of any type (zval*)
 O  - object of specific type given by class entry (zval*, zend_class_entry)
 p  - valid path (string without null bytes in the middle) and its length (char*, size_t)
- P  - valid path (string without null bytes in the middle) as zend_string (zend_string*)
+ P  - valid path (string without null bytes in the middle) as zend_string (zend_string)
 r  - resource (zval*)
 s  - string (with possible null bytes) and its length (char*, size_t)
- S  - string (with possible null bytes) as zend_string (zend_string*)
+ S  - string (with possible null bytes) as zend_string (zend_string)
 z  - the actual zval (zval*)
 *  - variable arguments list (0 or more)
 +  - variable arguments list (1 or more)
@@ -97,11 +97,11 @@ Both mistakes might cause memory corruptions and segfaults:
 1)
  char *str;
  long str_len; /* XXX THIS IS WRONG!! Use size_t instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len)
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len)

 2)
  int num; /* XXX THIS IS WRONG!! Use zend_long instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num)
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num)

 If you're in doubt, use check_parameters.php script to the parameters 
 and their types (it can be found in ./scripts/dev/ directory of PHP sources):
@@ -116,7 +116,7 @@ zend_long l;
 char *s;
 size_t s_len;
 zval *param;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
                          &l, &s, &s_len, &param) == FAILURE) {
    return;
 }
@@ -126,7 +126,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
 zval *obj;
 double d = 0.5;
 zend_class_entry *my_ce;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
                          &obj, my_ce, &d) == FAILURE) {
    return;
 }
@@ -136,7 +136,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
   If null is passed for object, obj will be set to NULL. */
 zval *obj;
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
                          &obj, &arr) == FAILURE) {
    return;
 }
@@ -144,7 +144,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",

 /* Gets a separated array which can also be null. */
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
                          &arr) == FAILURE) {
    return;
 }
@@ -161,10 +161,10 @@ char *s;
 */
 size_t length;

-if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                             "lll", &l1, &l2, &l3) == SUCCESS) {
    /* manipulate longs */
-} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                                    "s", &s, &length) == SUCCESS) {
    /* manipulate string */
 } else {
@@ -180,7 +180,7 @@ int i, num_varargs;
 zval *varargs = NULL;


-if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
    return;
 }

@@ -200,7 +200,7 @@ size_t str_len;
 int i, num_varargs;
 zval *varargs = NULL;

-if (zend_parse_parameters(ZEND_NUM_ARGS(), "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
    return;
 }

@@ -214,7 +214,7 @@ zval *array;
 int i, num_varargs;
 zval *varargs = NULL;

-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
    return;
 }

@@ -5,16 +5,17 @@
 5. ext/standard crypt
 6. ext/standard crypt's blowfish implementation
 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
-8. ext/standard/rand
-9. ext/standard/scanf
-10. ext/standard/strnatcmp.c
-11. ext/standard/uuencode
-12. libxmlrpc ext/xmlrpc
-13. libzip ext/zip
-14. main/snprintf.c
-15. main/strlcat
-16. main/strlcpy
-17. libgd see ext/gd/libgd/COPYING
+8. ext/json/json_parser
+9. ext/standard/rand
+10. ext/standard/scanf
+11. ext/standard/strnatcmp.c
+12. ext/standard/uuencode
+13. libxmlrpc ext/xmlrpc
+14. libzip ext/zip
+15. main/snprintf.c
+16. main/strlcat
+17. main/strlcpy
+18. libgd see ext/gd/libgd/COPYING

 5. ext/standard crypt

@@ -103,7 +104,31 @@ a legal notice, here is a blessing:
  May you share freely, never taking more than you give.


-8. ext/standard/rand
+8. ext/json/json_parser
+Copyright (c) 2005 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+9. ext/standard/rand
 The following php_mt_...() functions are based on a C++ class MTRand by
 Richard J. Wagner. For more information see the web page at
 http://www-personal.engin.umich.edu/~wagnerr/MersenneTwister.html
@@ -156,7 +181,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


-9. ext/standard/scanf
+10. ext/standard/scanf
 scanf.c --

 This file contains the base code which implements sscanf and by extension
@@ -202,7 +227,7 @@ authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.

-10. ext/standard/strnatcmp.c
+11. ext/standard/strnatcmp.c

 strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
 Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
@@ -223,7 +248,7 @@ freely, subject to the following restrictions:
 	 misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.

-11. ext/standard/uuencode
+12. ext/standard/uuencode
 Portions of this code are based on Berkeley's uuencode/uudecode
 implementation.

@@ -259,7 +284,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.


-12. libxmlrpc ext/xmlrpc
+13. libxmlrpc ext/xmlrpc

 Copyright 2000 Epinions, Inc. 

@@ -283,7 +308,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
 NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH 
 DAMAGES.

-13. libzip ext/zip
+14. libzip ext/zip
 zip.h -- exported declarations.
 Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner

@@ -315,7 +340,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-14. main/snprintf.c
+15. main/snprintf.c
 Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>

 Permission to use, copy, modify, and distribute this software for any
@@ -388,8 +413,8 @@ This code is based on, and used with the permission of, the
 SIO stdio-replacement strx_* functions by Panos Tsirigotis
 <panos@alumni.cs.colorado.edu> for xinetd.

-15. main/strlcat
-16. main/strlcpy
+16. main/strlcat
+17. main/strlcpy
 Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 All rights reserved.

@@ -28,7 +28,7 @@ The main functions are:
 PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
 PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
        count);
-PHPAPI size_t php_stream_printf(php_stream * stream, 
+PHPAPI size_t php_stream_printf(php_stream * stream TSRMLS_DC, 
        const char * fmt, ...);
 PHPAPI int php_stream_eof(php_stream * stream);
 PHPAPI int php_stream_getc(php_stream * stream);
@@ -47,7 +47,7 @@ Opening Streams
 In most cases, you should use this API:

 PHPAPI php_stream *php_stream_open_wrapper(const char *path, const char *mode,
-    int options, char **opened_path);
+    int options, char **opened_path TSRMLS_DC);

 Where:
    path is the file or resource to open.
@@ -80,7 +80,7 @@ PHPAPI php_stream *php_stream_fopen_tmpfile(void);
    Open a FILE * with tmpfile() and convert into a stream.

 PHPAPI php_stream *php_stream_fopen_temporary_file(const char *dir,
-    const char *pfx, char **opened_path);
+    const char *pfx, char **opened_path TSRMLS_DC);
    Generate a temporary file name and open it.

 There are some network enabled relatives in php_network.h:
@@ -138,7 +138,7 @@ SAPI_INPUT_FILTER_FUNC(my_sapi_input_filter)
    strcpy(raw_var, "RAW_");
    strlcat(raw_var,var,var_len+5);

-    php_register_variable_ex(raw_var, &new_var, array_ptr);
+    php_register_variable_ex(raw_var, &new_var, array_ptr TSRMLS_DC);

    php_strip_tags(*val, val_len, NULL, NULL, 0);

@@ -154,7 +154,7 @@ PHP_FUNCTION(my_get_raw)
    zval **tmp;
    zval *array_ptr = NULL;

-    if(zend_parse_parameters(2, "ls", &arg, &var, &var_len) == FAILURE) {
+    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
        return;
    }

@@ -170,8 +170,8 @@ TSRM_API void *tsrm_get_ls_cache(void);

 #define TSRMG_STATIC(id, type, element)	(TSRMG_BULK_STATIC(id, type)->element)
 #define TSRMG_BULK_STATIC(id, type)	((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
-#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
-#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
+#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
+#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
 #if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
 #else
@@ -1,197 +0,0 @@
-# =================================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
-# =================================================================================
-#
-# SYNOPSIS
-#
-#   AX_FUNC_WHICH_GETHOSTBYNAME_R
-#
-# DESCRIPTION
-#
-#   Determines which historical variant of the gethostbyname_r() call
-#   (taking three, five, or six arguments) is available on the system and
-#   defines one of the following macros accordingly:
-#
-#     HAVE_FUNC_GETHOSTBYNAME_R_6
-#     HAVE_FUNC_GETHOSTBYNAME_R_5
-#     HAVE_FUNC_GETHOSTBYNAME_R_3
-#
-#   as well as
-#
-#     HAVE_GETHOSTBYNAME_R
-#
-#   If used in conjunction with gethostname.c, the API demonstrated in
-#   test.c can be used regardless of which gethostbyname_r() is available.
-#   These example files can be found at
-#   http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
-#
-#   based on David Arnold's autoconf suggestion in the threads faq
-#
-#   Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten for
-#   Autoconf 2.5x, and updated for 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Caolan McNamara <caolan@skynet.ie>
-#   Copyright (c) 2008 Daniel Richard G. <skunk@iskunk.org>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
-
-    AC_LANG_PUSH([C])
-    AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
-
-    AC_CACHE_VAL([ac_cv_func_which_gethostbyname_r], [
-
-################################################################
-
-ac_cv_func_which_gethostbyname_r=unknown
-
-#
-# ONE ARGUMENT (sanity check)
-#
-
-# This should fail, as there is no variant of gethostbyname_r() that takes
-# a single argument. If it actually compiles, then we can assume that
-# netdb.h is not declaring the function, and the compiler is thereby
-# assuming an implicit prototype. In which case, we're out of luck.
-#
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            (void)gethostbyname_r(name) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=no])
-
-#
-# SIX ARGUMENTS
-# (e.g. Linux)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret, *retp;
-            char buf@<:@1024@:>@;
-            int buflen = 1024;
-            int my_h_errno;
-            (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=six])
-
-fi
-
-#
-# FIVE ARGUMENTS
-# (e.g. Solaris)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret;
-            char buf@<:@1024@:>@;
-            int buflen = 1024;
-            int my_h_errno;
-            (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=five])
-
-fi
-
-#
-# THREE ARGUMENTS
-# (e.g. AIX, HP-UX, Tru64)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret;
-            struct hostent_data data;
-            (void)gethostbyname_r(name, &ret, &data) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=three])
-
-fi
-
-################################################################
-
-]) dnl end AC_CACHE_VAL
-
-case "$ac_cv_func_which_gethostbyname_r" in
-    three|five|six)
-    AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1],
-              [Define to 1 if you have some form of gethostbyname_r().])
-    ;;
-esac
-
-case "$ac_cv_func_which_gethostbyname_r" in
-    three)
-    AC_MSG_RESULT([three])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_3], [1],
-              [Define to 1 if you have the three-argument form of gethostbyname_r().])
-    ;;
-
-    five)
-    AC_MSG_RESULT([five])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_5], [1],
-              [Define to 1 if you have the five-argument form of gethostbyname_r().])
-    ;;
-
-    six)
-    AC_MSG_RESULT([six])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_6], [1],
-              [Define to 1 if you have the six-argument form of gethostbyname_r().])
-    ;;
-
-    no)
-    AC_MSG_RESULT([cannot find function declaration in netdb.h])
-    ;;
-
-    unknown)
-    AC_MSG_RESULT([can't tell])
-    ;;
-
-    *)
-    AC_MSG_ERROR([internal error])
-    ;;
-esac
-
-AC_LANG_POP
-
-]) dnl end AC_DEFUN
-
@@ -66,7 +66,7 @@ dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
 AC_DEFUN([PTHREADS_CHECK_COMPILE], [
-AC_LINK_IFELSE([ AC_LANG_SOURCE([
+AC_TRY_RUN( [
 #include <pthread.h>
 #include <stddef.h>

@@ -80,11 +80,18 @@ int main() {
    int data = 1;
    pthread_mutexattr_init(&mattr);
    return pthread_create(&thd, NULL, thread_routine, &data);
-} ]) ], [
-  pthreads_checked=yes
+} ], [
+  pthreads_working=yes
  ], [
-  pthreads_checked=no
-  ]
+  pthreads_working=no
+  ], [
+  dnl For cross compiling running this test is of no use. NetWare supports pthreads
+  pthreads_working=no
+  case $host_alias in
+  *netware*)
+    pthreads_working=yes
+  esac
+]
 ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
@@ -122,34 +129,30 @@ else
      CFLAGS="$CFLAGS $flag"
      PTHREADS_CHECK_COMPILE
      CFLAGS=$ac_save
-      if test "$pthreads_checked" = "yes"; then
+      if test "$pthreads_working" = "yes"; then
        ac_cv_pthreads_cflags=$flag
        break
      fi
    done
  fi
-  ])
-
-  AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
-  ac_cv_pthreads_lib=
-  if test "$pthreads_working" != "yes"; then
-   for lib in pthread pthreads c_r; do
-      ac_save=$LIBS
-      LIBS="$LIBS -l$lib"
-      PTHREADS_CHECK_COMPILE
-      LIBS=$ac_save
-      if test "$pthreads_checked" = "yes"; then
-        ac_cv_pthreads_lib=$lib
-        break
-      fi
-    done
-  fi
-  ])
-
-  if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
-    pthreads_working="yes"
-  fi
 fi
+])
+
+AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
+ac_cv_pthreads_lib=
+if test "$pthreads_working" != "yes"; then
+  for lib in pthread pthreads c_r; do
+    ac_save=$LIBS
+    LIBS="$LIBS -l$lib"
+    PTHREADS_CHECK_COMPILE
+    LIBS=$ac_save
+    if test "$pthreads_working" = "yes"; then
+      ac_cv_pthreads_lib=$lib
+      break
+    fi
+  done
+fi
+])

 if test "$pthreads_working" = "yes"; then
  threads_result="POSIX-Threads found"
@@ -1,4 +1,3 @@
-m4_include([TSRM/m4/gethostbyname.m4])

 dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
 AC_DEFUN([TSRM_CHECK_GCC_ARG],[
@@ -33,8 +32,6 @@ AC_CHECK_HEADERS(stdarg.h)

 AC_CHECK_FUNCS(sigprocmask)

-AX_FUNC_WHICH_GETHOSTBYNAME_R()
-
 ])


@@ -92,6 +89,7 @@ else
 fi
 ])

+
 AC_DEFUN([TSRM_THREADS_CHECKS],[

 dnl For the thread implementations, we always use --with-*
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 The PHP Group                                |
+   | Copyright (c) 1997-2015 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        |
@@ -437,7 +437,6 @@ static shm_pair *shm_get(int key, void *addr)
 	TWG(shm) = newptr;
 	ptr = newptr + TWG(shm_size);
 	TWG(shm_size)++;
-	memset(ptr, 0, sizeof(*ptr));
 	return ptr;
 }

@@ -599,8 +598,8 @@ TSRM_API int shmget(int key, int size, int flags)
 		return -1;
 	}

-	snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key);
-	snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key);
+	sprintf(shm_segment, "TSRM_SHM_SEGMENT:%d", key);
+	sprintf(shm_info, "TSRM_SHM_DESCRIPTOR:%d", key);

 	shm_handle  = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
 	info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
@@ -612,32 +611,15 @@ TSRM_API int shmget(int key, int size, int flags)
 			created		= TRUE;
 		}
 		if (!shm_handle || !info_handle) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	} else {
 		if (flags & IPC_EXCL) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	}

 	shm = shm_get(key, NULL);
-	if (!shm) {
-		CloseHandle(shm_handle);
-		CloseHandle(info_handle);
-		return -1;
-	}
 	shm->segment = shm_handle;
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
@@ -671,27 +653,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 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 The PHP Group                                |
+   | Copyright (c) 1997-2015 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        |
@@ -72,7 +72,7 @@ typedef struct {

 #ifdef ZTS
 # define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
-TSRMLS_CACHE_EXTERN()
+TSRMLS_CACHE_EXTERN();
 #else
 # define TWG(v) (win32_globals.v)
 #endif
@@ -352,7 +352,7 @@ Relevant RFCs:
 Other language changes
 ----------------------

-* Removed support for static calls to non-static methods from an incompatible
+* Removed support for static calls to non-static calls form an incompatible
  $this context. In this case $this will not be defined, but the call will be
  allowed with a deprecation notice. An example:

@@ -442,8 +442,6 @@ Other
 - Curl:
  . Removed support for disabling the CURLOPT_SAFE_UPLOAD option. All curl file
    uploads must use the curl_file / CURLFile APIs.
-  . curl_getinfo($ch, CURLINFO_CERTINFO) returns certificate Subject and Issuer
-    as a string (PHP >= 5.6.25)

 - Date:
  . Removed $is_dst parameter from mktime() and gmmktime().
@@ -517,10 +515,6 @@ Other
 - Stream:
  . Removed set_socket_blocking() in favor of its alias stream_set_blocking().

- XML:
-  . xml_set_object() now requires to manually unset the $parser when finished,
-    to avoid memory leaks.
-
 - XSL:
  . Removed xsl.security_prefs ini option. Use XsltProcessor::setSecurityPrefs()
    instead.
@@ -538,8 +532,7 @@ Other
  . Closure::call() method added (works only with userland classes).
  . Added \u{xxxxxx} Unicode Codepoint Escape Syntax for double-quoted strings
    and heredocs.
-  . define() now supports arrays as constant values, fixing an oversight where
-    define() did not support arrays yet const syntax did.
+  . define() now supports arrays as constant values, fixing an oversight where define() did not support arrays yet const syntax did.
  . Added the comparison operator (<=>), aka the spaceship operator.
    (RFC: https://wiki.php.net/rfc/combined-comparison-operator)
  . Added the yield from operator for delegating Generators like coroutines.
@@ -552,20 +545,14 @@ Other
    (RFC: https://wiki.php.net/rfc/easy_userland_csprng)

 - Opcache
-  . Added second level file based opcode cache. It may be enabled by setting
-    opcache.file_cache=<DIR> configuration directive in php.ini. The second
-    level cache may improve performance when SHM is full, at server restart or
-    SHM reset. In addition, it's possibe to use file cache without SHM at all,
-    using opcache.file_cache_only=1 (this may be useful for sharing hosting),
-    and disable file cache consistency check, to speedup loading at the cost of
-    safety, using opcache.file_cache_consistency_checks=0.
-  . Added ability to move PHP code pages (PHP TEXT segment) into HUGE pages.
-    It's possible to enable/disable this feature in php.ini through
-    opcache.huge_code_pages=0/1. OS should be configured to provide huge pages.
-  . Added Windows only opcache.file_cache_fallback=1 ini option, which implies
-    the implemented fallback mechanism. When OPcache was not able to reattach
-    the shared memory segment to the desired address and opcache.file_cache
-    is on, opcache.file_cache_only=1 will be automatically enforced.
+  . Added second level file based opcode cache (experimental - disabled by
+    default). To enable it, PHP should be configured and built with 
+    --enable-opcache-file, then opcache.file_cache=<DIR> configuration directive
+    should be set in php.ini. The second level cache may improve performance
+    at server restart or SHM reset. In addition, it's possibe to use file cache
+    without SHM at all, using opcache.file_cache_only=1 (this may be useful for
+    sharing hosting), and disable file cache consistency check, to speedup
+    loading at the cost of safety, using opcache.file_cache_consistency_checks=0.

 - OpenSSL
  . Added "alpn_protocols" SSL context option allowing encrypted client/server
@@ -614,6 +601,9 @@ Other
 5. Changed Functions
 ========================================

+- parse_ini_file():
+- parse_ini_string():
+  . Added scanner mode INI_SCANNER_TYPED to yield typed .ini values.
 - unserialize():
  . Added second parameter for unserialize function 
    (RFC: https://wiki.php.net/rfc/secure_unserialize) allowing to specify
@@ -647,14 +637,9 @@ Other
 - debug_zval_dump
  It prints now "int" instead of "long", and "float" instead of "double".

- getenv()
-  Since 7.0.9, getenv() has optional second parameter, making it only
-  consider local environment and not SAPI environment if true.
-
 ========================================
 6. New Functions
 ========================================
-
 - GMP
  . Added gmp_random_seed().

@@ -678,8 +663,6 @@ Other
 7. New Classes and Interfaces
 ========================================

- ReflectionGenerator
- ReflectionType

 ========================================
 8. Removed Extensions and SAPIs
@@ -724,12 +707,6 @@ out, that the corresponding SDK isn't available anymore.
 - GD
  The bundled libgd requires libwebp instead of libvpx for the WebP functionality.

- Openssl
-  minimum supported OpenSSL version series was raised to 0.9.8
-
- Shmop
-  The shmop identifiers have been changed from ints to resources of type shmop.
-
 ========================================
 10. New Global Constants
 ========================================
@@ -753,8 +730,6 @@ out, that the corresponding SDK isn't available anymore.
  . ZLIB_FINISH

 - GD
-  . IMG_WEBP (>= 7.0.10)
-
  . T1Lib support removed, thus lifting the optional dependency on T1Lib, the
    following is therefore not available anymore:

@@ -771,14 +746,6 @@ out, that the corresponding SDK isn't available anymore.
      - 'gd PS font'
      - 'gd PS encoding'

- Zip
-  . Filename encoding flags, as of 7.0.8
-    - ZipArchive::FL_ENC_GUESS
-    - ZipArchive::FL_ENC_RAW
-    - ZipArchive::FL_ENC_STRICT
-    - ZipArchive::FL_ENC_UTF_8
-    - ZipArchive::FL_ENC_CP437
-
 ========================================
 11. Changes to INI File Handling
 ========================================
@@ -822,15 +789,3 @@ out, that the corresponding SDK isn't available anymore.
    always say "integer" and "float" instead of "long" and "double".
  . Output buffering now continues to work for an aborted connection if
    ignore_user_abort is set to true.
-  . Zend Extensions API was extended with zend_extension.op_array_persist_calc()
-    and zend_extensions.op_array_persist() handlers. They allow to store (or
-    reset) associated with op_array addition information in Opcache Shared
-    Memory.
-  . zend_internal_function.reserved[] array was introduced to allow association
-    of aditional information with internal functions. In PHP-5 it was possible
-    to use zend_function.op_array.reserved[] even for internal functions, but
-    now we don't allocate extra space.
-
- CURL
-  . curl_getinfo($ch, CURLINFO_CERTINFO) returns certificate Subject and Issuer
-    as a string (PHP >= 7.0.10)
@@ -90,7 +90,7 @@ changes. See: https://wiki.php.net/phpng-upgrading

       The only exceptions are the snprintf and zend_sprintf functions yet, because in some cases
       they can use the implemenations available on the system, not the PHP one. With snprintf the
-       macros ZEND_LONG_FMT and ZEND_ULONG_FMT should be used.
+       macros ZEND_INT_FMT and ZEND_UINT_FMT should be used.

  h. HashTable API

@@ -246,12 +246,6 @@ changes. See: https://wiki.php.net/phpng-upgrading
       and also renamed zend_qsort to zend_sort.
     - Added stable sorting algo zend_insert_sort.

-  w. Tick functions internal API change
-     Tick functions have different declaration now. They expect a single
-	 parameter while before they were parameterless. When registering the
-	 tick function a value for this parameter must be passed. This value will be
-	 provided to the tick function on every execution.
-
 ========================
 2. Build system changes
 ========================
@@ -1,43 +0,0 @@
--TEST--
-Using indirect append on ArrayAccess object
--FILE--
-<?php
-
-class AA implements ArrayAccess {
-    private $data = [];
-    public function &offsetGet($name) {
-        if (null === $name) {
-            return $this->data[];
-        } else {
-            return $this->data[$name];
-        }
-    }
-    public function offsetSet($name, $value) {
-        $this->data[$name] = $value;
-    }
-    public function offsetUnset($name) {}
-    public function offsetExists($name) {}
-}
-
-$aa = new AA;
-$aa[3] = 1;
-$aa[][][0] = 2;
-var_dump($aa);
-
-?>
--EXPECT--
-object(AA)#1 (1) {
-  ["data":"AA":private]=>
-  array(2) {
-    [3]=>
-    int(1)
-    [4]=>
-    array(1) {
-      [0]=>
-      array(1) {
-        [0]=>
-        int(2)
-      }
-    }
-  }
-}
@@ -1,36 +0,0 @@
--TEST--
-Array must be separated if unpacking by reference
--FILE--
-<?php
-
-function inc(&... $args) {
-    foreach ($args as &$arg) {
-        $arg++;
-    }
-}
-
-$arr = [1, 2];
-$arr[] = 3;
-$arr2 = $arr;
-inc(...$arr);
-var_dump($arr);
-var_dump($arr2);
-
-?>
--EXPECT--
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
@@ -1,19 +0,0 @@
--TEST--
-Array addition is not commutative -- do not swap operands
--FILE--
-<?php
-
-$array = [1, 2, 3];
-$array = [4, 5, 6] + $array;
-var_dump($array);
-
-?>
--EXPECT--
-array(3) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-  [2]=>
-  int(6)
-}
@@ -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--
-Array type declaration
+Array type hint
 --FILE--
 <?php
 function foo(array $a) {
@@ -12,8 +12,8 @@ foo(123);
 --EXPECTF--
 3

-Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %s on line 7 and defined in %s:2
+Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php:2
 Stack trace:
 #0 %s(%d): foo(123)
 #1 {main}
-  thrown in %s on line 2
+  thrown in %sarray_type_hint_001.php on line 2
@@ -1,23 +0,0 @@
--TEST--
-Bug #70528 (assert() with instanceof adds apostrophes around class name)
--INI--
-zend.assertions=1
-assert.exception=0
-assert.warning=1
--FILE--
-<?php
-
-namespace Foo;
-class Bar {}
-
-$bar = "Bar";
-assert(new \stdClass instanceof $bar);
-assert(new \stdClass instanceof Bar);
-assert(new \stdClass instanceof \Foo\Bar);
-?>
--EXPECTF--
-Warning: assert(): assert(new \stdClass() instanceof $bar) failed in %sbug70528.php on line %d
-
-Warning: assert(): assert(new \stdClass() instanceof Bar) failed in %sbug70528.php on line %d
-
-Warning: assert(): assert(new \stdClass() instanceof \Foo\Bar) failed in %sbug70528.php on line %d
@@ -18,7 +18,7 @@ bool(true)
 bool(true)

 Warning: assert(): assert(false) failed in %sexpect_016.php on line 6
-bool(false)
+NULL
 bool(true)

 Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_016.php on line 8
@@ -25,9 +25,9 @@ bool(true)
 bool(true)

 Warning: assert(): assert(false) failed in %sexpect_018.php on line 10
-bool(false)
+NULL
 bool(true)

 Warning: assert(): assert(false) failed in %sexpect_018.php on line 12
-bool(false)
+NULL
 bool(true)
@@ -1,11 +0,0 @@
--TEST--
-Serialization of backtick literal is incorrect
--INI--
-zend.assertions=1
--FILE--
-<?php
-
-assert_options(ASSERT_WARNING);
-assert(false && `echo -n ""`);
--EXPECTF--
-Warning: assert(): assert(false && `echo -n ""`) failed in %s%east_serialize_backtick_literal.php on line %d
@@ -68,7 +68,7 @@ catch (Exception $e) {
 --EXPECTF--
 Hello World!
 ===NONE===
-string(%d) "Method NoneTest::__toString() must return a string value"
+string(56) "Method NoneTest::__toString() must return a string value"
 ===THROW===

-Fatal error: Method ErrorTest::__toString() must not throw an exception, caught Exception: This is an error! in %sbug26166.php on line %d
+Fatal error: Method ErrorTest::__toString() must not throw an exception in %sbug26166.php on line %d
@@ -8,8 +8,7 @@ class Thing {}
 function boom()
 {
    $reader = xml_parser_create();
-    $thing = new Thing();
-    xml_set_object($reader, $thing);
+    xml_set_object($reader, new Thing());
    die("ok\n");
    xml_parser_free($reader);
 }
@@ -10,4 +10,5 @@ class foo {
 $obj = new foo("Hello world");
 ?>
 --EXPECTF--
-Fatal error: Cannot use $this as parameter in %s on line %d
+Fatal error: Cannot re-assign $this in %sbug41117_1.php on line 3
+
@@ -1,5 +1,5 @@
 --TEST--
-Bug #42802 (Namespace not supported in types)
+Bug #42802 (Namespace not supported in typehints)
 --FILE--
 <?php
 namespace foo;
@@ -1,20 +0,0 @@
--TEST--
-Bug #52355 (Negating zero does not produce negative zero)
--FILE--
-<?php
-
-var_dump(-0.0);
-var_dump(-(float)"0");
-
-$foo = -sin(0);
-
-var_dump($foo);
-
-var_dump(@(1.0 / -0.0));
-
-?>
--EXPECT--
-float(-0)
-float(-0)
-float(-0)
-float(-INF)
@@ -14,7 +14,7 @@ class Bad {
 $bad = new Bad();
 echo "$bad";
 --EXPECTF--
-Fatal error: Method Bad::__toString() must not throw an exception, caught Exception: Oops, I cannot do this in %sbug60909_2.php on line %d
+Fatal error: Method Bad::__toString() must not throw an exception in %sbug60909_2.php on line 0


 !!!shutdown!!!
@@ -23,4 +23,4 @@ class B extends A {
 }
 ?>
 --EXPECTF--
-Fatal error: Declaration of B::foo($var) must be compatible with I::foo() in %sbug62358.php on line 17
+Warning: Declaration of B::foo($var) should be compatible with A::foo() in %sbug62358.php on line %d
@@ -18,4 +18,4 @@ $test = new Foo();
 var_dump($test instanceof Baz);
 ?>
 --EXPECTF--
-Fatal error: Access level to Foo::bad() must be public (as in class Baz) in %sbug69467.php on line %d
+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)
-}
-
@@ -5,4 +5,4 @@ Bug #69767 (Default parameter value with wrong type segfaults)
 function foo(String $bar = 0) {}
 ?>
 --EXPECTF--
-Fatal error: Default value for parameters with a string type can only be string or NULL in %sbug69767.php on line %d
+Fatal error: Default value for parameters with a string type hint can only be string or NULL in %sbug69767.php on line %d
@@ -27,6 +27,8 @@ $c10 = new C10;
 var_dump($c10[] += 5);
 --EXPECTF--
 Inside C10::offsetGet
+
+Notice: Undefined variable: offset in %sbug69955.php on line 10
 NULL

 Inside C10::offsetSet
@@ -1,15 +0,0 @@
--TEST--
-Bug #69989: Cycle collection for yielded values
--FILE--
-<?php
-
-function gen() {
-    yield yield;
-}
-$gen = gen();
-$gen->send($gen);
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,26 +0,0 @@
--TEST--
-Bug #70083 (Use after free with assign by ref to overloaded objects)
--FILE--
-<?php
-
-class foo {
-	private $var;
-	function __get($e) {
-		return $this;
-	}
-}
-
-function &noref() { $foo = 1; return $foo; }
-
-$foo = new foo;
-$foo->i = &noref();
-var_dump($foo);
-
-?>
--EXPECTF--
-
-Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
-
@@ -1,10 +0,0 @@
--TEST--
-Bug #70430: Stack buffer overflow in zend_language_parser()
--FILE--
-<?php
-
-$"*** Testing function() :  ***\n";
-
-?>
--EXPECTF--
-Parse error: syntax error, unexpected '"*** Testing function() :  ***' (T_CONSTANT_ENCAPSED_STRING), expecting variable (T_VARIABLE) or '{' or '$' in %s on line %d
@@ -1,20 +0,0 @@
--TEST--
-Bug #70478 (**= does no longer work)
--FILE--
-<?php
-
-class foo {
-	public $a = 3;
-	private $b = 4;
-
-	function __construct() {
-		$this->a **= $this->b;
-	}
-}
-
-$a = new foo;
-var_dump($a->a);
-
-?>
--EXPECT--
-int(81)
@@ -1,83 +0,0 @@
--TEST--
-Bug #70547 (unsetting function variables corrupts backtrace)
--FILE--
-<?php
-function brokenTrace($arg1, &$arg2, $arg3){
-	backtraceWrapper();
-	var_dump(func_get_args());
-	unset($arg3);
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-	var_dump(func_get_arg(2));
-	var_dump(func_get_arg(3));
-	backtraceWrapper();
-	unset($arg1);
-	var_dump(func_get_args());
-	backtraceWrapper();
-	unset($arg2);
-	backtraceWrapper();
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-	var_dump(func_get_arg(2));
-	var_dump(func_get_arg(3));
-}
-$arg2 = "2nd";
-brokenTrace("1st", $arg2, "3th", "4th");
-function backtraceWrapper(){
-	$bt = debug_backtrace();
-	var_dump($bt[1]['args']);
-}
-?>
--EXPECT--
-array(4) {
-  [0]=>
-  string(3) "1st"
-  [1]=>
-  &string(3) "2nd"
-  [2]=>
-  string(3) "3th"
-  [3]=>
-  string(3) "4th"
-}
-array(4) {
-  [0]=>
-  string(3) "1st"
-  [1]=>
-  string(3) "2nd"
-  [2]=>
-  string(3) "3th"
-  [3]=>
-  string(3) "4th"
-}
-string(3) "1st"
-string(3) "2nd"
-NULL
-string(3) "4th"
-array(3) {
-  [0]=>
-  string(3) "1st"
-  [1]=>
-  &string(3) "2nd"
-  [3]=>
-  string(3) "4th"
-}
-array(2) {
-  [1]=>
-  string(3) "2nd"
-  [3]=>
-  string(3) "4th"
-}
-array(2) {
-  [1]=>
-  &string(3) "2nd"
-  [3]=>
-  string(3) "4th"
-}
-array(1) {
-  [3]=>
-  string(3) "4th"
-}
-NULL
-NULL
-NULL
-string(3) "4th"
@@ -1,10 +0,0 @@
--TEST--
-Bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
--FILE--
-<?php
-class a {}
-$x = (new ReflectionFunction("substr"))->getClosure();
-$x->call(new a);
-?>
--EXPECTF--
-Warning: Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure() in %s on line %d
@@ -1,18 +0,0 @@
--TEST--
-Bug #70662: Duplicate array key via undefined index error handler
--FILE--
-<?php
-
-$a = [];
-set_error_handler(function() use(&$a) {
-    $a['b'] = 2;
-});
-$a['b'] += 1;
-var_dump($a);
-
-?>
--EXPECT--
-array(1) {
-  ["b"]=>
-  int(1)
-}
@@ -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 rebind scope of closure created by ReflectionFunctionAbstract::getClosure() in %s on line %d
-NULL
@@ -1,22 +0,0 @@
--TEST--
-Bug #70689 (Exception handler does not work as expected)
--FILE--
-<?php
-
-function foo($foo) {
-	echo "Executing foo\n";
-}
-
-set_error_handler(function($errno, $errstr) {
-	throw new Exception($errstr);
-});
-
-try {
-	foo();
-} catch (Exception $e) {
-	echo $e->getMessage(), "\n";
-}
-
-?>
--EXPECTF--
-Missing argument 1 for foo(), called in %sbug70689.php on line %d and defined
@@ -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,10 +0,0 @@
--TEST--
-Bug #70782: null ptr deref and segfault (zend_get_class_fetch_type)
--FILE--
-<?php
-
-(-0)::$prop;
-
-?>
--EXPECTF--
-Fatal error: Illegal class name in %s on line %d
@@ -1,25 +0,0 @@
--TEST--
-Bug #70785 (Infinite loop due to exception during identical comparison)
--FILE--
-<?php
-
-set_error_handler(function($no, $msg) {
-	throw new Exception($msg);
-});
-
-try {
-	if ($a === null) { // ZEND_VM_SMART_BRANCH  
-		undefined_function('Null');
-	}
-} catch (Exception $e) {
-}
-
-try  {
-	$c === 3; // ZEND_VM_NEXT_OPCODE
-	undefined_function();
-} catch (Exception $e) {
-}
-?>
-okey
--EXPECT--
-okey
@@ -1,17 +0,0 @@
--TEST--
-Bug #70804 (Unary add on negative zero produces positive zero)
--FILE--
-<?php
-
-var_dump(+(-0.0));
-var_dump(+(float)"-0");
-
-$foo = +(-sin(0));
-
-var_dump($foo);
-
-?>
--EXPECT--
-float(-0)
-float(-0)
-float(-0)
@@ -1,46 +0,0 @@
--TEST--
-Bug #70805 (Segmentation faults whilst running Drupal 8 test suite)
--FILE--
-<?php
-class A {
-}
-
-class B {
-}
-
-class C {
-	public function __destruct() {
-		if (isset($GLOBALS["a"])) {
-			unset($GLOBALS["array"]);
-			unset($GLOBALS["a"]); // this will be called in gc_colloct_roots and put $a into gc roots buf
-		}
-	}
-}
-
-$a = new A;
-$a->b = new B;
-$a->b->a = $a;
-
-$i = 0;
-
-$c = new A;
-$array = array($c); //This is used to leave a room for $GLOBALS["a"]
-unset($c);
-
-while ($i++ < 9997) {
-	$t = [];
-	$t[] = &$t;
-	unset($t);
-}
-$t = [new C];
-$t[] = &$t;
-unset($t); // This is used to trigger C::__destruct while doing gc_colloct_roots
-
-$e = $a;
-unset($a); // This one can not be putted into roots buf because it's full, thus gc_colloct_roots will be called, 
-           // but C::__destructor which is called in gc_colloct_roots will put $a into buf
-		   // which will make $a be putted into gc roots buf twice
-var_dump(gc_collect_cycles());
-?>
--EXPECT--
-int(0)
@@ -1,43 +0,0 @@
--TEST--
-Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Crash)
--FILE--
-<?php
-class A {
-}
-
-class B {
-}
-
-class C {
-	public function __destruct() {
-		if (isset($GLOBALS["a"])) {
-			unset($GLOBALS["array"]);
-			unset($GLOBALS["a"]);
-		}
-	}
-}
-
-$a = new A;
-$a->b = new B;
-$a->b->a = $a;
-
-$i = 0;
-
-$c = new A;
-$array = array($c); 
-unset($c);
-
-while ($i++ < 9997) {
-	$t = [];
-	$t[] = &$t;
-	unset($t);
-}
-$t = [new C];
-$t[] = &$t;
-unset($t);
-unset($a);
-
-var_dump(gc_collect_cycles());
-?>
--EXPECT--
-int(2)
@@ -1,37 +0,0 @@
--TEST--
-Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Memleak)
--FILE--
-<?php
-class A {
-}
-
-class B {
-}
-
-class C {
-	public function __destruct() {
-		if (isset($GLOBALS["a"])) {
-			unset($GLOBALS["a"]);
-		}
-	}
-}
-
-$a = new A;
-$a->b = new B;
-$a->b->a = $a;
-
-$i = 0;
-
-while ($i++ < 9998) {
-	$t = [];
-	$t[] = &$t;
-	unset($t);
-}
-$t = [new C];
-$t[] = &$t;
-unset($t);
-
-unset($a);
-var_dump(gc_collect_cycles());
--EXPECT--
-int(2)
@@ -1,34 +0,0 @@
--TEST--
-Bug #70873 (Regression on private static properties access)
--FILE--
-<?php
-
-class A {
-	private static $x = 1;
-}
-
-class B extends A {
-	function bar() {
-		var_dump(self::$x);
-	}
-};
-
-class C extends A {
-	function bar() {
-		var_dump(A::$x);
-	}
-};
-
-
-$a = new B;
-$a->bar();
-
-$b = new C;
-$b->bar();
-?>
--EXPECTF--
-Fatal error: Uncaught Error: Cannot access  property B::$x in %sbug70873.php:%d
-Stack trace:
-#0 %sbug70873.php(%d): B->bar()
-#1 {main}
-  thrown in %sbug70873.php on line %d
@@ -1,15 +0,0 @@
--TEST--
-Bug #70895 null ptr deref and segfault with crafted callable
--FILE--
-<?php
-
-array_map("%n", 0);
-array_map("%n %i", 0);
-array_map("%n %i aoeu %f aoeu %p", 0);
-?>
--EXPECTREGEX--
-Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n' not found or invalid function name in .+
-
-Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n %i' not found or invalid function name in .+
-
-Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n %i aoeu %f aoeu %p' not found or invalid function name in .+bug70895.php on line \d+
@@ -1,22 +0,0 @@
--TEST--
-Bug #70895 null ptr deref and segfault with crafted callable
--FILE--
-<?php 
-	function m($f,$a){
-		return array_map($f,0);
-	}
-
-	echo implode(m("",m("",m("",m("",m("0000000000000000000000000000000000",("")))))));
-?>
--EXPECTF--
-Warning: array_map() expects parameter 1 to be a valid callback, function '0000000000000000000000000000000000' not found or invalid function name in %sbug70898.php on line %d
-
-Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %sbug70898.php on line %d
-
-Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %sbug70898.php on line %d
-
-Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %sbug70898.php on line %d
-
-Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %sbug70898.php on line %d
-
-Warning: implode(): Argument must be an array in %sbug70898.php on line %d
@@ -1,10 +0,0 @@
--TEST--
-Bug #70912 (Null ptr dereference when class property is initialised to a dereferenced value)
--FILE--
-<?php
-class A {
-	public $a=[][];
-}
-?>
--EXPECTF--
-Fatal error: Cannot use [] for reading in %sbug70912.php on line %d
@@ -1,17 +0,0 @@
--TEST--
-Bug #70914 zend_throw_or_error() format string vulnerability 
--SKIPIF--
-<?php
-if (!extension_loaded("pdo_sqlite")) {
-	die("skip pdo_sqlite required");
-}
-?>
--FILE--
-<?php
-
-$db = new PDO('sqlite::memory:');
-$st = $db->query('SELECT 1');
-$re = $st->fetchObject('%Z');
-?>
--EXPECTREGEX--
-Fatal error: Class '%Z' not found in .+bug70914.php on line \d+
@@ -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: Foo in %sbug70944.php:%d
-Stack trace:
-#0 {main}"
-string(%d) "Exception: Foo in %sbug70944.php:%d
-Stack trace:
-#0 {main}
-
-Next Exception: 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 B extends Foo
-{
-    use T;
-}
-?>
--EXPECTF--
-Warning: 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,14 +0,0 @@
--TEST--
-Bug #70967 (Weird error handling for __toString when Error is thrown)
--FILE--
-<?php
-class A {
-	public function __toString() {
-		undefined_function();
-	}
-}
-
-echo (new A);
-?>
--EXPECTF--
-Fatal error: Method A::__toString() must not throw an exception, caught Error: Call to undefined function undefined_function() in %sbug70967.php on line %d
@@ -1,15 +0,0 @@
--TEST--
-Bug #70987 (static::class within Closure::call() causes segfault)
--FILE--
-<?php
-
-class foo {}
-$bar = function () {
-   return static::class;
-};
-
-var_dump($bar->call(new foo));
-
-?>
--EXPECTF--
-string(3) "foo"
@@ -1,26 +0,0 @@
--TEST--
-Bug #70997 (When using parentClass:: instead of parent::, static context changed)
--FILE--
-<?php
-class A {
-    const TEST = false;
-    
-    public function test()
-    {
-        var_dump(static::TEST);
-    }
-}
-
-class B extends A {
-    const TEST = true;
-    
-    public function test()
-    {
-        A::test();
-    }
-}
-
-$b = new B;
-$b->test();
--EXPECT--
-bool(true)
@@ -1,31 +0,0 @@
--TEST--
-Bug #71067 (Local object in class method stays in memory for each call)
--INI--
-opcache.enable=0
-error_reporting=0
--FILE--
-<?php
-class Test {
-	public function test(){
-		$arr = (object) [
-			'children' => []
-		];
-		$arr->children[] = 1;
-		return $arr;
-	}
-}
-
-$o = new Test();
-$o->test();
-
-print_r($o->test());
-?>
--EXPECT--
-stdClass Object
-(
-    [children] => Array
-        (
-            [0] => 1
-        )
-
-)
@@ -1,14 +0,0 @@
--TEST--
-Bug #71086: Invalid numeric literal parse error within highlight_string() function
--FILE--
-<?php
-
-$highlightedString = highlight_string("<?php \n 09 09 09;", true);
-var_dump($highlightedString);
-
-?>
--EXPECT--
-string(169) "<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;<br />&nbsp;</span><span style="color: #007700">09&nbsp;09&nbsp;09;</span>
-</span>
-</code>"
@@ -1,19 +0,0 @@
--TEST--
-Bug #71154: Incorrect HT iterator invalidation causes iterator reuse
--FILE--
-<?php
-
-$array = [1, 2, 3];
-foreach ($array as &$ref) {
-    /* Free array, causing free of iterator */
-    $array = [];
-    /* Reuse the iterator.
-     * However it will also be reused on next foreach iteration */
-    $it = new ArrayIterator([1, 2, 3]);
-    $it->rewind();
-}
-var_dump($it->current());
-
-?>
--EXPECT--
-int(1)
@@ -1,25 +0,0 @@
--TEST--
-Bug #71163 (Segmentation Fault (cleanup_unfinished_calls))
--FILE--
-<?php
-function __autoload($name) { 
-	eval ("class $name extends Exception { public static function foo() {}}");
-	throw new Exception("boom");
-}
-
-function test2() {
-	try {
-		Test::foo();
-	} catch (Exception $e) {
-		echo "okey";
-	}
-}
-
-function test() {
-	test2();
-}
-
-test();
-?>
--EXPECT--
-okey
@@ -1,10 +0,0 @@
--TEST--
-Bug #71221 (Null pointer deref (segfault) in get_defined_vars via ob_start)
--FILE--
-<?php 
-ob_start("get_defined_vars");
-ob_end_clean();
-?>
-okey
--EXPECT--
-okey
@@ -1,28 +0,0 @@
--TEST--
-Bug #71248 (Wrong interface is enforced)
--FILE--
-<?php
-class Hint1 { }
-class Hint2 { }
-
-abstract class Base {
-    public function __construct(Hint1 $x) { }
-}
-
-interface Iface {
-    public function __construct(Hint1 $x);
-}
-
-class Foo extends Base implements Iface {
-}
-
-$code = <<<'PHP'
-abstract class Bar extends Base {
-    public function __construct(Hint2 $x) { }
-}
-PHP;
-eval($code);
-?>
-OK
--EXPECT--
-OK
@@ -1,27 +0,0 @@
--TEST--
-Bug #71275 (Bad method called on cloning an object having a trait)
--FILE--
-<?php
-
-trait MyTrait {
-	public function _() {
-		throw new RuntimeException('Should not be called');
-	}
-}
-
-
-class MyClass {
-	use MyTrait;
-
-	public function __clone() {
-		echo "I'm working hard to clone";
-	}
-}
-
-
-$instance = new MyClass();
-clone $instance;
-
-?>
--EXPECT--
-I'm working hard to clone
@@ -1,28 +0,0 @@
--TEST--
-Bug #71300 (Segfault in zend_fetch_string_offset)
--FILE--
-<?php
-function test1() {
-	for ($n = 'a'; $n < 'g'; $n++) {
-		$$n = 1;
-	}
-	$$n = $$n[++$n] = "test";
-	return $$n;
-}
-
-var_dump(test1());
-
-function test2() {
-    /* See #71303 for why not using for loop here */
-	$n = "a";
-	$$n .= $$n[++$n] = "test";
-	return $$n;
-}
-
-var_dump(test2());
-?>
--EXPECTF--
-string(4) "test"
-
-Notice: Array to string conversion in %sbug71300.php on line %d
-string(9) "Arraytest"
@@ -1,48 +0,0 @@
--TEST--
-Bug #71336 (Wrong is_ref on properties as exposed via get_object_vars())
--FILE--
-<?php
-class A
-{
-	protected $bar = array('baz');
-
-	function bar()
-	{
-		array_pop($this->bar);
-		$vars = get_object_vars($this);
-		$this->bar[] = array('buz');
-		print_r($vars);
-	}
-
-	function foo() {
-		array_pop($this->bar);
-		$dummy = &$this->bar;
-		$vars = get_object_vars($this);
-		$this->bar[] = array('buz');
-		print_r($vars);
-	}
-}
-
-(new A())->bar();
-(new A())->foo();
-?>
--EXPECT--
-Array
-(
-    [bar] => Array
-        (
-        )
-
-)
-Array
-(
-    [bar] => Array
-        (
-            [0] => Array
-                (
-                    [0] => buz
-                )
-
-        )
-
-)
@@ -1,61 +0,0 @@
--TEST--
-Bug #71359: Null coalescing operator and magic
--FILE--
-<?php
-class AA {
-    private $data = [];
-    public function __isset($name) {
-        echo "__isset($name)\n";
-        return array_key_exists($name, $this->data);
-    }
-    public function &__get($name) {
-        echo "__get($name)\n";
-        if (!array_key_exists($name, $this->data)) {
-            throw new Exception('Unknown offset');
-        }
-        return $this->data[$name];
-    }
-    public function __set($name, $value) {
-        echo "__set($name)\n";
-        $this->data[$name] = $value;
-    }
-    public function __unset($name) {
-        echo "__unset($name)\n";
-        unset($this->data[$name]);
-    }
-}
-
-$aa = new AA;
-var_dump(isset($aa->zero->one->two));
-var_dump(isset($aa->zero->foo));
-var_dump($aa->zero ?? 42);
-var_dump($aa->zero->one->two ?? 42);
-$aa->zero = new AA;
-$aa->zero->one = new AA;
-var_dump(isset($aa->zero->one->two));
-var_dump($aa->zero->one->two ?? 42);
-?>
--EXPECT--
-__isset(zero)
-bool(false)
-__isset(zero)
-bool(false)
-__isset(zero)
-int(42)
-__isset(zero)
-int(42)
-__set(zero)
-__get(zero)
-__set(one)
-__isset(zero)
-__get(zero)
-__isset(one)
-__get(one)
-__isset(two)
-bool(false)
-__isset(zero)
-__get(zero)
-__isset(one)
-__get(one)
-__isset(two)
-int(42)
@@ -1,25 +0,0 @@
--TEST--
-Bug #71414 (Interface method override inherited method and implemented in a trait causes fatal error)
--FILE--
-<?php
-interface InterfaceY {
-    public function z(): string;
-}
-
-trait TraitY {
-    public function z(): string {
-    }
-}
-
-class X {
-    public function z() {
-    }
-}
-
-class Y extends X implements InterfaceY {
-    use TraitY;
-}
-
-echo "ok";
--EXPECT--
-ok
@@ -1,15 +0,0 @@
--TEST--
-bug #71428.1: inheritance with null default values
--XFAIL--
-This is a BC break
--FILE--
-<?php
-class A {
-    public function m(array $a = null) {}
-}
-class B extends A {
-    public function m(array $a = []) {}
-}
--EXPECTF--
-Warning: Declaration of B::m(array $a = Array) should be compatible with A::m(array $a = NULL) in %sbug71428.1.php on line 7
-
@@ -1,23 +0,0 @@
--TEST--
-bug #71428.2: inheritance of ye olde dynamic interfaces
--SKIPIF--
-<?php if (!extension_loaded('pdo')) die("skip PDO is not available"); ?>
--FILE--
-<?php
-interface StatementInterface {
-	public function fetch($first = null, $second, $third);
-}
-
-class Statement extends PDOStatement implements StatementInterface {}
-
-interface StatementInterface1 {
-	public function fetch($first = null, $second = null, $third = null);
-}
-
-class Statement1 extends PDOStatement implements StatementInterface1 {}
-
-echo "ok";
-?>
--EXPECT--
-ok
-
@@ -1,13 +0,0 @@
--TEST--
-bug #71428: Validation type inheritance with = NULL
--XFAIL--
-This is a BC break
--FILE--
-<?php
-class A { }
-class B           {  public function m(A $a = NULL, $n) { echo "B.m";} };
-class C extends B {  public function m(A $a       , $n) { echo "C.m";} };
-?>
--EXPECTF--
-Warning: Declaration of C::m(A $a, $n) should be compatible with B::m(A $a = NULL, $n) in %sbug71428.3.php on line 4
-
@@ -1,13 +0,0 @@
--TEST--
-Bug #71470: Leaked 1 hashtable iterators
--FILE--
-<?php
-
-$array = [1, 2, 3];
-foreach ($array as &$v) {
-    die("foo\n");
-}
-
-?>
--EXPECT--
-foo
@@ -1,23 +0,0 @@
--TEST--
-Bug #71474: Crash because of VM stack corruption on Magento2
--FILE--
-<?php
-class foo {
-	function __call($name, $args) {
-		$a = $b = $c = $d = $e = $f = 1;
-	}
-}
-
-function test($n, $x) {
-//	var_dump($n);
-	if ($n > 0) {
-		$x->bug();
-		test($n - 1, $x);
-	}
-}
-
-test(3000, new foo());
-echo "OK\n";
-?>
--EXPECT--
-OK
@@ -1,23 +0,0 @@
--TEST--
-Bug #71529: Variable references on array elements don't work when using count
--FILE--
-<?php
-
-$a = [1];
-$a[] = &$a[out(count($a) - 1)];
-var_dump($a);
-
-function out($what) {
-    var_dump($what);
-    return $what;
-}
-
-?>
--EXPECT--
-int(0)
-array(2) {
-  [0]=>
-  &int(1)
-  [1]=>
-  &int(1)
-}
@@ -1,30 +0,0 @@
--TEST--
-Bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::$callable())
--FILE--
-<?php
-
-function getMethodName(&$methodName) {
-	$methodName = Abc::METHOD_NAME;
-}
-
-class Abc {
-	const METHOD_NAME = "goal";
-
-	private static function goal() {
-		echo "success\n";
-	}
-
-	public static function run() {
-		$method = "foobar";
-		getMethodName($method);
-		var_dump(is_callable("self::$method"));
-		self::$method();
-	}
-}
-
-Abc::run();
-
-?>
--EXPECT--
-bool(true)
-success
@@ -1,17 +0,0 @@
--TEST--
-Bug #71695 (Global variables are reserved before execution)
--FILE--
-<?php
-function provideGlobals() {
-	var_dump(array_key_exists("foo", $GLOBALS));
-	var_dump(isset($GLOBALS["foo"]));
-	$GLOBALS += array("foo" => "foo");
-}
-
-provideGlobals();
-echo $foo;
-?>
--EXPECT--
-bool(false)
-bool(false)
-foo
@@ -1,19 +0,0 @@
--TEST--
-Bug #71724: yield from does not count EOLs
--FILE--
-<?php
-
-function test()
-{
-    yield
-
-
-
-
-    from [__LINE__];
-}
-var_dump(test()->current());
-
-?>
--EXPECT--
-int(10)
@@ -1,64 +0,0 @@
--TEST--
-Bug #71731: Null coalescing operator and ArrayAccess
--FILE--
-<?php
-
-class AA implements ArrayAccess {
-    private $data = [];
-    public function offsetExists($name) {
-        echo "offsetExists($name)\n";
-        return array_key_exists($name, $this->data);
-    }
-    public function &offsetGet($name) {
-        echo "offsetGet($name)\n";
-        if (!array_key_exists($name, $this->data)) {
-            throw new Exception('Unknown offset');
-        }
-        return $this->data[$name];
-    }
-    public function offsetSet($name, $value) {
-        echo "offsetSet($name)\n";
-        $this->data[$name] = $value;
-    }
-    public function offsetUnset($name) {
-        echo "offsetUnset($name)\n";
-        unset($this->data[$name]);
-    }
-}
-
-$aa = new AA;
-var_dump(isset($aa[0][1][2]));
-var_dump(isset($aa[0]->foo));
-var_dump($aa[0] ?? 42);
-var_dump($aa[0][1][2] ?? 42);
-
-$aa[0] = new AA;
-$aa[0][1] = new AA;
-var_dump(isset($aa[0][1][2]));
-var_dump($aa[0][1][2] ?? 42);
-
-?>
--EXPECT--
-offsetExists(0)
-bool(false)
-offsetExists(0)
-bool(false)
-offsetExists(0)
-int(42)
-offsetExists(0)
-int(42)
-offsetSet(0)
-offsetGet(0)
-offsetSet(1)
-offsetExists(0)
-offsetGet(0)
-offsetExists(1)
-offsetGet(1)
-offsetExists(2)
-bool(false)
-offsetExists(0)
-offsetGet(0)
-offsetExists(1)
-offsetGet(1)
-offsetExists(2)
-int(42)
@@ -1,16 +0,0 @@
--TEST--
-Bug #71737: Memory leak in closure with parameter named $this
--FILE--
-<?php
-
-class Test {
-    public function method() {
-        return function($this) {};
-    }
-}
-
-(new Test)->method()(new stdClass);
-
-?>
--EXPECTF--
-Fatal error: Cannot use $this as parameter in %s on line %d
@@ -1,27 +0,0 @@
--TEST--
-Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
--FILE--
-<?php
-function a ($option) {
-	b($option['bla']);
-	c($option);
-	var_dump($option);
-}
-function b (&$string) {
-	$string = 'changed';
-}
-function c ($option) {
-	switch ($option['bla']) {
-	case 'changed':
-		$copy = $option;
-		$copy['bla'] = 'copy';
-		break;
-	}
-}
-a(array('bla' => 'false'));
-?>
--EXPECTF--
-array(1) {
-  ["bla"]=>
-  string(7) "changed"
-}
@@ -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,28 +0,0 @@
--TEST--
-Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing)
--FILE--
-<?php
-class constructs_in_destructor {
-  public function __destruct() {
-    //We are now in zend_objects_store_call_destructors
-    //This causes a realloc in zend_objects_store_put
-    for ($i = 0; $i < 10000; ++$i) {
-      $GLOBALS["a$i"] = new stdClass;
-    }
-    //Returns to zend_objects_store_call_destructors, to access freed memory.
-  }
-}
-
-$a = new constructs_in_destructor;
-//Create cycle so destructors are ran only in zend_objects_store_call_destructors
-$a->a = $a;
-
-// Create some objects so zend_objects_store_call_destructors has something
-// to do after constructs_in_destructor is destroyed.
-for ($i = 0; $i < 200; ++$i) {
-  $GLOBALS["b$i"] = new stdClass;
-}
-?>
-okey
--EXPECT--
-okey
@@ -1,12 +0,0 @@
--TEST--
-Bug #71871: Interfaces allow final and abstract functions
--FILE--
-<?php
-
-interface test {
-    final function test();
-}
-
-?>
--EXPECTF--
-Fatal error: Access type for interface method test::test() must be omitted in %s on line %d
Author	SHA1	Message	Date
Anatol Belski	d03e8e0e87	sync NEWS	2015-09-02 22:12:15 +02:00
Anatol Belski	4401f56eef	bump version	2015-09-02 22:10:25 +02:00
Anatol Belski	6ef7c6358f	Merge branch 'master' into PHP-7.0.0 * master: (201 commits) sync NEWS Add missing variable from birdstep_commit() which got removed in `e8fcd52ef` Align NEWS entries format Add CVE for #70140 (PHP 7.0.0 Beta 3) Seems master is not affected We should keep one refcount to resource Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex) Fixed test Partially fix bug #67167 - Wrong return value... move the phpdbg NEWS entry to the correct version add missing news entries Skip if ext/filter isn't loaded Merge branch 'PHP-5.6' 5.5.30 next Use ZSTR_VAL fix dir separators in test use correct api fix leak cleanup an atavism add overflow check ...	2015-09-02 22:08:24 +02:00
Anatol Belski	b7e910e969	update NEWS	2015-08-18 21:04:33 +02:00
Bob Weinand	ab57205019	Fixed bug #70293 (Crash with specific assertions and zend.assertions=-1)	2015-08-18 21:02:53 +02:00
Xinchen Hui	a02b3fd4b0	Fixed memleak in Zend/tests/bug39297	2015-08-18 17:49:38 +02:00
Anatol Belski	ff724aadfb	add NEWS entry	2015-08-18 17:20:51 +02:00
Xinchen Hui	be58583ced	Fixed bug #70288 (Apache crash related to ZEND_SEND_REF)	2015-08-18 17:19:37 +02:00
Anatol Belski	1ef817d796	sync NEWS	2015-08-18 17:04:26 +02:00
Anatol Belski	e39876bae2	bump versions	2015-08-18 16:06:04 +02:00
Anatol Belski	6fe551d086	Merge branch 'master' into PHP-7.0.0 * master: (211 commits) Fixed bug #70272 (Segfault in pdo_mysql) Improved fix for bug #70262 It should not be skip Skip the test with valgrind Revert "Do not truncate exception traces upon anon class name" fix inheritance of internal interfaces with constants fix printzv (refcount) Do not truncate exception traces upon anon class name fix test TSRM_TLS should be usable in NTS build no need to skip this test if no dictionaries are installed new test for enchant pwl file Check and use correct signature_len type for EVP_VerifyFinal updated NEWS fixed changed error message in test updated NEWS Removed dead code Renamed struct member Fix #70277: new DateTimeZone($foo) is ignoring text after null byte Fixed bug #70262 (Accessing array crashes PHP 7.0beta3) ...	2015-08-18 16:00:17 +02:00
Anatol Belski	1674bd9b15	sync NEWS	2015-08-05 06:56:40 +02:00
Anatol Belski	69168b4d0c	Merge branch 'master' into PHP-7.0.0 * master: (24 commits) 5.5.29 next fix merge fix test fix merge fix test virtual_file_ex uses emalloc in 5.6+ __wakeup doesn't have to be final update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fixed bug #70098 (Real memory usage doesn't decrease) Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes ...	2015-08-05 06:15:16 +02:00
Anatol Belski	02f762f146	sync NEWS	2015-08-04 20:20:01 +02:00
Anatol Belski	738729274f	set versions	2015-08-04 20:18:28 +02:00
Anatol Belski	72bbde5e78	Merge branch 'master' into PHP-7.0.0 * master: run credits script	2015-08-04 20:16:27 +02:00
Anatol Belski	29f0493075	Merge branch 'master' into PHP-7.0.0 * master: (174 commits) Fixed possible access to uninitialized data (prevents valgrind issues in Zend/tests/bug70089.phpt) Added NEWS entry Get rid of ZEND_FAST_CALL_UNBOUND Move most "finally" related code-generation from pass_two() to compiler. Try to fix finally issue Fix further leaks Fix valgrind errors in phpdbg Fix last invalid read Also revert debugging run-tests.php changes... Fix a few valgrind errors in phpdbg Fix breaking on HANDLE_EXCEPTION (opline_before_exception) Remove unneded space(s) Fixed tests (system dependent numbers are replaced with %d) Fixed test updated UPGRADING Give better credit in NEWS Fixed bug #70182 (Segfault in ZEND_ASSIGN_OP handlers) more info for UPGRADING.INTERNALS updated NEWS Fixed bug #70183 null pointer deref (segfault) in zend_eval_const_expr fix inconsistent dll linkage ...	2015-08-04 11:38:46 +02:00
Anatol Belski	0f60a746e4	fix merge mistake	2015-07-21 05:55:54 -07:00
Anatol Belski	735a7c6a56	one more test from `ef1b588f6a`	2015-07-21 05:52:12 -07:00
Anatol Belski	94e7c770ba	readd test from `3bb70fe290`	2015-07-21 05:51:09 -07:00
Anatol Belski	26abfc8bc9	readd commit `3bb70fe290`	2015-07-21 05:49:36 -07:00
Anatol Belski	ec4350e4c8	bump versions	2015-07-21 12:40:58 +02:00
Anatol Belski	3e971e7d5c	sync NEWS	2015-07-21 12:34:30 +02:00
Anatol Belski	b148ef4496	Merge branch 'master' into PHP-7.0.0 * master: (204 commits) Reverted `ad4533fdba` update UPGRADING updated NEWS fix comment libwebp support for linux Replaced libvpx by libwebp (first draft; Windows only) update news with bug #70022 Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR. Add tests for json_last_error()/json_last_error_msg() failures updated NEWS updated NEWS Exclude opcache from a few opcode related tests updated NEWS updated NEWS Fix #66387: Stack overflow with imagefilltoborder Fix various Windows issues (e.g. dir separators) Remove bogus exception_save() from FETCH_CLASS Fix readline/libedit build Do not use readline when not having a tty This is important for e.g. run-tests.php Add show_unexecuted option to phpdbg_end_oplog() ... Conflicts: Zend/tests/temporary_cleaning_001.phpt Zend/tests/temporary_cleaning_003.phpt Zend/tests/temporary_cleaning_004.phpt Zend/tests/temporary_cleaning_005.phpt Zend/zend_compile.c Zend/zend_compile.h sapi/phpdbg/phpdbg_opcode.c	2015-07-21 12:27:50 +02:00
Anatol Belski	ad8a73dd55	Revert "Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)" This reverts commit `5ee8413259`.	2015-07-10 12:06:56 +02:00
Anatol Belski	ceefc0947a	Revert "Tuned off dubugging of live ranges" This reverts commit `404dc93d35`.	2015-07-10 12:06:33 +02:00
Anatol Belski	2928e412e6	Revert "Remove loop_var_stack" This reverts commit `b3a4c05071`.	2015-07-10 12:06:06 +02:00
Anatol Belski	770571bce9	Revert "ZEND_SEPARATE reuses temporaries" This reverts commit `dfe6fdaa72`.	2015-07-10 12:05:43 +02:00
Anatol Belski	6cdf477254	Revert "Add assertion in liveliness computation" This reverts commit `62062dcd0e`.	2015-07-10 12:05:35 +02:00
Anatol Belski	5784b8f8e6	Revert "Fixed invalid live-range detection" This reverts commit `724e98498a`.	2015-07-10 12:05:26 +02:00
Anatol Belski	ee573eba67	fixed NEWS	2015-07-09 17:34:49 +02:00
Dmitry Stogov	724e98498a	Fixed invalid live-range detection	2015-07-09 17:26:01 +02:00
Nikita Popov	62062dcd0e	Add assertion in liveliness computation Assert that a live-range does not start, while one for the same variable is already active. To satisfy this constraint, explicitly exclude writes from JMP_SET and COALESCE. They were previously also handled correctly, because their result variable was only killed after the second write to it after the false branch. This just makes it more explicit.	2015-07-09 17:25:42 +02:00
Nikita Popov	dfe6fdaa72	ZEND_SEPARATE reuses temporaries	2015-07-09 17:25:26 +02:00
Anatol Belski	8d09c84bd3	update NEWS	2015-07-08 01:35:42 +02:00
Anatol Belski	955303ddc8	bump the versions	2015-07-08 01:20:10 +02:00
Anatol Belski	2a0e037c0d	Merge branch 'master' into PHP-7.0.0 * master: (282 commits) Remove loop_var_stack SQLite3::open/__construct has 2 optional args Better fix for bug #69958 Better fix for bug #69958 Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Use NULL where possible for exception class Allow NULL for exception_ce fix C89 compat Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file fix C89 compat added info about the user space stream context for pipes mention pcre.jit in the supplied php.ini-* Fix test related to `c22da81` add missing second argument for ucfirst to the proto ...	2015-07-08 01:17:19 +02:00
Anatol Belski	9876b2c2cf	sync NEWS	2015-06-23 19:33:33 +02:00
Anatol Belski	5ea2b70645	bump version	2015-06-23 19:32:58 +02:00
Anatol Belski	29711264a8	Merge branch 'master' into PHP-7.0.0 * master: (239 commits) Moved NEWS entry for bug #69864 to proper category Moved NEWS entry for bug #69864 to proper category Moved NEWS entry for bug #69864 to proper category updated NEWS updated NEWS Fixed two errors in LDAP tests Fixed two errors in LDAP tests Revert "Simplify php_implode(). Fill the resulting string in direct order." The patch slightly improved performance of string imploding, but reduced speed of integers imploding. Encapsulate FastCGI implementation details. Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes. Fixed bug #69905 (null ptr deref and segfault in ZEND_FETCH_DIM_RW_SPEC_VAR_UNUSED_HANDLER) updated NEWS Fixed bug #69864 (Segfault in preg_replace_callback) Simplify php_implode(). Fill the resulting string in direct order. bump API version to 6.8 bump API version to 6.8 bump API version to 6.8 Drop duplicate object-to-type notices Added comments Drop superfluous __toString handling code This macro is defined in zend_virtual_cwd.h, avoid redef ...	2015-06-23 18:49:42 +02:00
Ferenc Kovacs	dbf30365aa	Merge remote-tracking branch 'origin/master' into PHP-7.0.0 * origin/master: add missing NEWS entries add missing NEWS entries Fixed bug #69646 (OS command injection vulnerability in escapeshellarg) add NEWS Fixed bug #68776 fix test update NEWS fix typo Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value.	2015-06-10 10:49:51 +02:00
Ferenc Kovacs	9cb8cb4797	Merge branch 'master' into PHP-7.0.0 * master: fix hard-coded path in test	2015-06-09 16:42:24 +02:00
Ferenc Kovacs	8a884d628b	7.0.0alpha1	2015-06-09 14:24:39 +02:00