Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (304 commits)
  OCI8 build change: Fix source variable definition for C89 compatibility
  bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS
  bump API versions
  configure output alignment
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Revert "Fixed issue #115 (path issue when using phar)."
  Update LiteSpeed SAPI code to V6.4
  Fixed typo in Makefile.frag
  updated NEWS
  Remove outdate codes, make it clearer, although just a bit..
  Update NEWS
  Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  Fix English here
  limit virtual_cwd_activate() duplicated call to ZTS only
  ...

Author: rlerdorf

.travis.yml

@@ -29,4 +29,4 @@ before_script:
     - . ./travis/ext/pdo_pgsql/setup.sh
 
 # Run PHPs run-tests.php 
-script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff
+script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120

CODING_STANDARDS

@@ -151,7 +151,7 @@ Naming Conventions
 
 7.  Classes should be given descriptive names. Avoid using abbreviations where
     possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters (CampelCaps starting with a capital letter).
+    without underscore delimiters (CamelCaps starting with a capital letter).
     The class name should be prefixed with the name of the 'parent set' (e.g.
     the name of the extension)::
 

NEWS

@@ -1,51 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 201?, PHP 5.6.0
-
-- Core:
-  . Improved IS_VAR operands fetching. (Laruence, Dmitry)
-  . Implemented internal operator overloading
-    (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
-  . Made calls from incompatible context issue an E_DEPRECATED warning instead
-    of E_STRICT (phase 1 of RFC: https://wiki.php.net/rfc/incompat_ctx).
-	(Gustavo)
-
-- cURL:
-  . Implemented FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir
-    or safe_mode). (Adam)
-
-- GMP:
-  . Moved GMP to use object as the underlying structure and implemented various
-    improvements based on this.
-    (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
-
-- mysqlnd:
-  . Disabled flag for SP OUT variables for 5.5+ servers as they are not natively
-    supported by the overlying APIs. (Andrey)
-
-- OPcache:
-  . Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
-    (Laruence, Dmitry)
-  . Added an optimization pass to merged identical constants (and related
-    cache_slots) in op_array->literals table. (Laruence, Dmitry)
-  . Added script level constant replacement optimization pass. (Dmitry)
-
-- PDO_pgsql:
-  . Fixed Bug #42614 (PDO_pgsql: add pg_get_notify support). (Matteo)
-  . Fixed Bug #63657 (pgsqlCopyFromFile, pgsqlCopyToArray use Postgres < 7.3
-    syntax). (Matteo)
-
-- Session:
-  . Fixed Bug #65315 (session.hash_function silently fallback to default md5)
-    (Yasuo)
-  . Implemented Request #54649 (Create session_serializer_name()). (Yasuo)
-  . Implemented Request #17860 (Session write short circuit). (Yasuo)
-  . Implemented Request #20421 (session_abort() and session_reset() function).
-    (Yasuo)
-  . Implemented Request #11100 (session_gc() function). (Yasuo)
-
-- Standard:
-  . Implemented FR #65634 (HTTP wrapper is very slow with protocol_version
-    1.1). (Adam)
+?? ??? 20??, PHP 5.7.0 
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

README.EXT_SKEL

@@ -31,6 +31,11 @@ HOW TO USE IT
 
     ./buildconf; ./configure --enable-module_name; make
 
+  The definition of PHP_MODULE_NAME_VERSION will be present in the
+  php_module_name.h and injected into the zend_module_entry definition. This
+  is required by the PECL website for the version string conformity checks
+  against package.xml
+
   But if you already have planned the overall scheme of your module, what
   functions it will contain, their return types and the arguments they take
   (a very good idea) and don't want to bother yourself with creating function

README.SELF-CONTAINED-EXTENSIONS

@@ -153,3 +153,18 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
         #ifdef COMPILE_DL_FOO
         ZEND_GET_MODULE(foo)
         #endif
+
+PECL SITE CONFORMITY
+
+  If you plan to release an extension to the PECL website, there are several
+  points to be regarded.
+
+ 1. Add LICENSE or COPYING to the package.xml
+
+ 2. The following should be defined in one of the extension header files
+
+        #define PHP_FOO_VERSION "1.2.3"
+
+    This macros has to be used within your foo_module_entry to indicate the
+    extension version.
+

README.md

@@ -17,7 +17,7 @@ See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
 information on the process.
 
 Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always
-open a ticket at http://bugs.php.net and reference the bug id using #NNNNNN.
+open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.
 
     Fix #55371: get_magic_quotes_gpc() throws deprecation warning
 
@@ -28,3 +28,12 @@ open a ticket at http://bugs.php.net and reference the bug id using #NNNNNN.
 
 We do not merge pull requests directly on github. All PRs will be
 pulled and pushed through http://git.php.net.
+
+
+Guidelines for contributors
+===========================
+- [CODING_STANDARDS](/CODING_STANDARDS)
+- [README.GIT-RULES](/README.GIT-RULES)
+- [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
+- [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
+

TSRM/Makefile.am

@@ -1,6 +1,6 @@
 ## process this file with automake to produce Makefile.am
 AUTOMAKE_OPTIONS=foreign
 noinst_LTLIBRARIES=libtsrm.la
-libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c
+libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c
 
 depend:

TSRM/TSRM.dsp

@@ -1,5 +1,5 @@
 // vim:ft=javascript
 // $Id$
 
-ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");
+ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c");
 

TSRM/config.w32

@@ -32,7 +32,7 @@
 #ifdef TSRM_WIN32
 #include <Sddl.h>
 #include "tsrm_win32.h"
-#include "tsrm_virtual_cwd.h"
+#include "zend_virtual_cwd.h"
 
 #ifdef ZTS
 static ts_rsrc_id win32_globals_id;

TSRM/tsrm_win32.c

@@ -35,17 +35,11 @@ PHP X.Y UPGRADE NOTES
 3. Deprecated Functionality
 ========================================
 
-- Incompatible context calls:
-  Instance calls from an incompatible context are now deprecated and issue
-  E_DEPRECATED instead of E_STRICT. See https://wiki.php.net/rfc/incompat_ctx
 
 ========================================
 4. Changed Functions
 ========================================
 
-- cURL:
-  CURLOPT_SAFE_UPLOAD is now turned on by default and uploads with @file 
-  do not work unless it is explicitly set to false.
 
 ========================================
 5. New Functions
@@ -66,21 +60,6 @@ PHP X.Y UPGRADE NOTES
 8. Other Changes to Extensions
 ========================================
 
-- GMP:
-  The GMP extension now uses objects as the underlying data structure, rather
-  than resources. GMP instances now support dumping, serialization, cloning,
-  casts to primitive types and have overloaded operators.
-  (RFC: https://wiki.php.net/rfc/operator_overloading_gmp)
-
-- OCI8:
-  - Added Implicit Result Set support for Oracle Database 12c with a
-    new oci_get_implicit_resultset() function.
-  - Using 'oci_execute($s, OCI_NO_AUTO_COMMIT)' for a SELECT no longer
-    unnecessarily initiates an internal ROLLBACK during connection
-    close.
-  - Added DTrace probes enabled with PHP's generic --enable-dtrace
-  - The oci_internal_debug() function is now a no-op.
-  - The phpinfo() output format for OCI8 has changed.
 
 ========================================
 9. New Global Constants
@@ -96,9 +75,3 @@ PHP X.Y UPGRADE NOTES
 11. Other Changes
 ========================================
 
-- File upload:
-  Uploads equal or greater than 2GB in size are now accepted.
-
-- HTTP stream wrapper:
-  HTTP 1.1 requests now include a Connection: close header unless explicitly
-  overridden by setting a Connection header via the header context option.

UPGRADING

@@ -5,6 +5,8 @@ UPGRADE NOTES - PHP X.Y
 1. Internal API changes
   a. Addition of do_operation and compare object handlers
   b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros
+  c. POST data handling
+  d. Arginfo changes
 
 2. Build system changes
   a. Unix build system changes
@@ -15,58 +17,9 @@ UPGRADE NOTES - PHP X.Y
 1. Internal API changes
 ========================
 
-  a. Addition of do_operation and compare object handlers
-
-  Two new object handlers have been added:
-
-    do_operation:
-    typedef int (*zend_object_do_operation_t)(
-        zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC
-    );
-
-    compare:
-    typedef int (*zend_object_compare_zvals_t)(
-        zval *result, zval *op1, zval *op2 TSRMLS_DC
-    );
-
-  The first handler is used to overload arithmetic operations. The first
-  argument specifies the opcode of the operator, result is the target zval,
-  op1 the first operand and op2 the second operand. For unary operations
-  op2 is NULL. If the handler returns FAILURE PHP falls back to the default
-  behavior for the operation.
-
-  The second handler is used to perform comparison operations with
-  non-objects. The value written into result must be an IS_LONG with value
-  -1 (smaller), 0 (equal) or 1 (greater). The return value is a SUCCESS/FAILURE
-  return code. The difference between this handler and compare_objects is
-  that it will be triggered for comparisons with non-objects and objects of
-  different types. It takes precedence over compare_objects.
-
-  Further docs in the RFC: https://wiki.php.net/rfc/operator_overloading_gmp
-
-  b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros
-
-  The return_value_ptr argument to internal functions is now always set.
-  Previously it was only available for functions returning by-reference.
-  return_value_ptr can now be used to return zvals without copying them.
-  For this purpose two new macros are provided:
-
-      RETVAL_ZVAL_FAST(zv); /* analog to RETVAL_ZVAL(zv, 1, 0) */
-      RETURN_ZVAL_FAST(zv); /* analog to RETURN_ZVAL(zv, 1, 0) */
-
-  The macros behave similarly to the non-FAST variants with copy=1 and
-  dtor=0, but will try to return the zval without making a copy by utilizing
-  return_value_ptr.
 
 ========================
 2. Build system changes
 ========================
 
-  a. Unix build system changes
-    - The bison version check is now a blacklist instead of a whitelist.
-    - The bison binary can be specified through the YACC environment/configure
-      variable. Previously `bison` was assumed to be in $PATH. 
-
-  b. Windows build system changes
-    - 
 

UPGRADING.INTERNALS

@@ -18,7 +18,7 @@ libZend_la_SOURCES=\
 	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
 	zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
-	zend_generators.c
+	zend_generators.c zend_virtual_cwd.c
 
 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@

Zend/Makefile.am

@@ -9,11 +9,11 @@ Modified:        2001-09-17
 1. Background/Need
 ==================
 
-Many internal function of PHP will reject parameters because of their
+Many internal functions of PHP will reject parameters because of their
 type (the array and variable function come to mind).  For userland
 this is not an easy task as there is no uniform way to do it.  An
 addition to the engine for requiring loose types would allow
-delevopers to know that the data passed to their functions is of the
+developers to know that the data passed to their functions are of the
 correct type and reduce the need for duplicating the same code in
 every function to check for the type of data.
 
@@ -57,7 +57,7 @@ function foo (array $var){
 ===========
 
 Mis-matches in type should be reported as fatal errors and should halt
-the execution of a script as that function can not be run and code
+the execution of a script as that function cannot be run and code
 following could not reliably run.
 
 

Zend/RFCs/003.txt

@@ -9,7 +9,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
   # non-working versions, e.g. "3.0 3.2";
   # remove "none" when introducing the first incompatible bison version an 
   # separate any following additions by spaces
-  bison_version_exclude="none"
+  bison_version_exclude="3.0"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

Zend/Zend.dsp

@@ -1,15 +1,13 @@
 --TEST--
-Bug #64578 (Closures with static variables can be generators)
---XFAIL--
-Bug #64979 not fixed yet.
+Bug #64979 (Wrong behavior of static variables in closure generators)
 --FILE--
 <?php
 
 function new_closure_gen() {
-	return function() { 
-		static $foo = 0; 
-		yield ++$foo; 
-	};
+    return function() {
+        static $foo = 0;
+        yield ++$foo;
+    };
 }
 
 $closure1 = new_closure_gen();
@@ -20,9 +18,9 @@ $gen2 = $closure1();
 $gen3 = $closure2();
 
 foreach (array($gen1, $gen2, $gen3) as $gen) {
-  foreach ($gen as $val) {
-    print "$val\n";
-  }
+    foreach ($gen as $val) {
+        var_dump($val);
+    }
 }
 
 ?>

Zend/acinclude.m4

@@ -0,0 +1,22 @@
+--TEST--
+Bug #65322: compile time errors won't trigger auto loading
+--FILE--
+<?php
+
+spl_autoload_register(function($class) {
+    var_dump($class);
+    class B {}
+});
+
+set_error_handler(function($_, $msg, $file) {
+    var_dump($msg, $file);
+    new B;
+});
+
+eval('class A { function a() {} function __construct() {} }');
+
+?>
+--EXPECTF--
+string(50) "Redefining already defined constructor for class A"
+string(%d) "%s(%d) : eval()'d code"
+string(1) "B"