Merge branch 'master' into master-rfc-session-lock4

Sannis · Jan 25, 2015 · 4ba97bb · 4ba97bb
2 parents 0c9bfa9 + 388624d
commit 4ba97bb
Show file tree

Hide file tree

Showing 208 changed files with 182,131 additions and 182,526 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -49,7 +49,6 @@ UPGRADING.INTERNALS             merge=NEWS
 /ext/spl/tests/SplArray_fromArray.phpt	-crlf
 /ext/standard/tests/dir/scandir_variation3.phpt	-crlf
 /ext/standard/tests/general_functions/escapeshellcmd-win32.phpt	-crlf
-/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt	-crlf
 /ext/standard/tests/strings/bug26817.phpt	-crlf
 /ext/standard/tests/strings/bug26973.phpt	-crlf
 /ext/standard/tests/strings/bug27457.phpt	-crlf

diff --git a/EXTENSIONS b/EXTENSIONS
@@ -136,7 +136,7 @@ STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
 EXTENSION:           interbase
-PRIMARY MAINTAINER:  Ard Biesheuvel <[email protected]>, Jouni Ahto <[email protected]>
+PRIMARY MAINTAINER:  Ard Biesheuvel <[email protected]>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2014 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

diff --git a/NEWS b/NEWS
@@ -34,13 +34,19 @@
   . Fixed oversight where define() did not support arrays yet const syntax did. (Andrea, Dmitry)
   . Use "integer" and "float" instead of "long" and "double" in ZPP, type hint and conversion error messages. (Andrea)
   . Implemented FR #55428 (E_RECOVERABLE_ERROR when output buffering in output buffering handler). (Kalle)
+  . Removed scoped calls of non-static methods from an incompatible $this
+    context. (Nikita)
+  . Removed support for #-style comments in ini files. (Nikita)
+  . Invalid octal literals in source code now produce compile errors, fixes PHPSadness #31. (Andrea)
 
 - Date:
   . Fixed day_of_week function as it could sometimes return negative values
     internally. (Derick)
+  . Removed $is_dst parameter from mktime() and gmmktime(). (Nikita)
 
 - DBA:
   . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)
+  . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)
 
 - DOM:
   . Made DOMNode::textContent writeable. (Tjerk)
@@ -70,6 +76,10 @@
   . Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8
     + Opcache). (Laruence)
 
+- OpenSSL:
+  . Fix bug #61285, #68329, #68046, #41631: encrypted streams don't observe
+    socket timeouts (Brad Broerman)
+
 - pcntl:
   . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
     when setting SIG_DFL). (Julien)
@@ -104,10 +114,15 @@
   . Fix user session handlers (See rfc:session.user.return-value). (Sara)
   . Added intdiv() function. (Andrea)
   . Improved precision of log() function for base 2 and 10. (Marc Bennewitz)
+  . Remove string category support in setlocale(). (Nikita)
+  . Remove set_magic_quotes_runtime() and its alias magic_quotes_runtime().
+    (Nikita)
 
 - Streams:
   . Fixed bug #68532 (convert.base64-encode omits padding bytes).
     (blaesius at krumedia dot de)
+  . Removed set_socket_blocking() in favor of its alias stream_set_blocking().
+    (Nikita)
 
 - XSL:
   . Fixed bug #64776 (The XSLT extension is not thread safe). (Mike)

diff --git a/README.EXT_SKEL b/README.EXT_SKEL
@@ -164,11 +164,11 @@ PHP_FUNCTION(module_name_drawtext)
     char *text = NULL;
     int argc = ZEND_NUM_ARGS();
     int image_id = -1;
-    int text_len;
+    size_t text_len;
     int font_id = -1;
-    long x;
-    long y;
-    long color;
+    zend_long x;
+    zend_long y;
+    zend_long color;
     zval *image = NULL;
     zval *font = NULL;
 

diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS
@@ -196,11 +196,11 @@ last commit id to web/php.git, then, mirrors will now sync
 Getting the stable release announced
 ------------------------------------
 
-1. Run the bumpRelease script for phpweb on your local checkout
+1. Update phpweb/include/releases.inc with the old release info
+  (updates the download archives)
 
- a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
-    The release announcement file should list in detail security fixes and
-    changes in behavior (whether due to a bug fix or not).
+ a. You can run ``php bin/bumpRelease 5`` if you are making a release for the
+    highest branch, otherwise you have to do this manually, see point 1.b
 
  b. In case multiple PHP minor versions are in active development you have
     to manually copy the old information to include/releases.inc
@@ -220,8 +220,9 @@ Getting the stable release announced
 
  f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
 
-3. Update phpweb/include/releases.php with the old release info
-  (updates the download archives)
+3. Create the release file (releases/x_y_z.php)
+   Usually we use the same content as for point 6, but included in php template
+   instead of the release xml.
 
 4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
    (prepare for next RC)

diff --git a/UPGRADING b/UPGRADING
@@ -54,10 +54,20 @@ PHP X.Y UPGRADE NOTES
   . zend_function.common.num_args don't include the variadic argument anymore.
   . ob_start() no longer issues an E_ERROR, but instead an E_RECOVERABLE_ERROR in case an 
     output buffer is created in an output buffer handler.
+  . Removed support for scoped calls to non-static methods from an incompatible
+    $this context. See details in https://wiki.php.net/rfc/incompat_ctx.
+  . Removed support for #-style comments in ini files. Use ;-style comments
+    instead.
   . Added zend_memnstr_ex, which is based on string matching sunday algo.
   . Added zend_memnrstr, zend_memnrstr_ex.
   . Added hybrid sorting algo zend_sort for better performance.
   . Added stable sorting algo zend_insert_sort.
+  . Invalid octal literals in source code now produce compile errors, fixing
+    PHPSadness #31. Previously, the invalid digits (and any following valid 
+    digits) were simply ignored, such that 0781 became 7.
+
+- Date:
+  . Removed $is_dst parameter from mktime() and gmmktime().
 
 - DBA
   . dba_delete() now returns false if the key was not found for the inifile
@@ -68,6 +78,14 @@ PHP X.Y UPGRADE NOTES
   . gmp_setbit() and gmp_clrbit() now return FALSE for negative indices, making
     them consistent with other GMP functions.
 
+- Standard:
+  . Removed string category support in setlocale(). Use the LC_* constants
+    instead.
+  . Removed set_magic_quotes_runtime() and its alias magic_quotes_runtime().
+
+- Stream:
+  . Removed set_socket_blocking() in favor of its alias stream_set_blocking().
+
 ========================================
 2. New Features
 ========================================
@@ -81,9 +99,6 @@ PHP X.Y UPGRADE NOTES
     and heredocs.
   . define() now supports arrays as constant values, fixing an oversight where define() did not support arrays yet const syntax did.
 
-- Standard
-  . intdiv() function for integer division added.
-
 ========================================
 3. Changes in SAPI modules
 ========================================
@@ -115,7 +130,10 @@ PHP X.Y UPGRADE NOTES
 6. New Functions
 ========================================
 - GMP
-  . Added gmp_random_seed()
+  . Added gmp_random_seed().
+
+- Standard
+  . Added intdiv() function for integer division.
 
 ========================================
 7. New Classes and Interfaces

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
@@ -15,6 +15,7 @@ PHP 7.0 INTERNALS UPGRADE NOTES
   n. ZEND_ENGINE_2 removal
   o. Updated final class modifier
   p. TSRM changes
+  q. gc_collect_cycles() is now hookable
 
 2. Build system changes
   a. Unix build system changes
@@ -169,6 +170,12 @@ PHP 7.0 INTERNALS UPGRADE NOTES
      Additionally, if an extension triggers its own threads, TSRMLS_CACHE shouldn't
      be passed to that threads directly.
 
+  q. gc_collect_cycles() is now a function pointer, and can be replaced in the
+     same manner as zend_execute_ex() if needed (for example, to include the
+     time spent in the garbage collector in a profiler). The default
+     implementation has been renamed to zend_gc_collect_cycles(), and is
+     exported with ZEND_API.
+
 
 ========================
 2. Build system changes

diff --git a/Zend/tests/bug63055.phpt b/Zend/tests/bug63055.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #63055 (Segfault in zend_gc with SF2 testsuite)
+--INI--
+zend.enable_gc=1
 --FILE--
 <?php
 /* the default gc root size is 10,000 */

diff --git a/Zend/tests/bug64896.phpt b/Zend/tests/bug64896.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #64896 (Segfault with gc_collect_cycles using unserialize on certain objects)
+--INI--
+zend.enable_gc=1
 --FILE--
 <?php
 $bar = NULL;

diff --git a/Zend/tests/constant_arrays.phpt b/Zend/tests/constant_arrays.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Constant arrays
+--INI--
+zend.enable_gc=1
 --FILE--
 <?php
 
@@ -85,7 +87,7 @@ array(4) {
 int(3)
 array(1) {
   [0]=>
-  int(3)
+  &int(3)
 }
 array(1) {
   [0]=>

diff --git a/Zend/tests/declare_002.phpt b/Zend/tests/declare_002.phpt
@@ -2,19 +2,17 @@
 Testing declare statement with several type values
 --SKIPIF--
 <?php
-if (!ini_get("zend.multibyte")) {
-  die("skip Requires zend.multibyte=1");
-}
 if (!extension_loaded("mbstring")) {
   die("skip Requires ext/mbstring");
 }
 ?>
+--INI--
+zend.multibyte=1
 --FILE--
 <?php
 
 declare(encoding = 1);
 declare(encoding = 1123131232131312321);
-declare(encoding = NULL);
 declare(encoding = 'utf-8');
 declare(encoding = M_PI);
 
@@ -26,6 +24,4 @@ Warning: Unsupported encoding [%d] in %sdeclare_002.php on line 3
 
 Warning: Unsupported encoding [%f] in %sdeclare_002.php on line 4
 
-Warning: Unsupported encoding [] in %sdeclare_002.php on line 5
-
-Fatal error: Cannot use constants as encoding in %sdeclare_002.php on line 7
+Fatal error: Encoding must be a literal in %sdeclare_002.php on line 6
diff --git a/Zend/tests/declare_004.phpt b/Zend/tests/declare_004.phpt
@@ -1,17 +1,12 @@
 --TEST--
 Testing declare statement with several type values
---SKIPIF--
-<?php
-if (!ini_get("zend.multibyte")) {
-  die("skip Requires zend.multibyte=1");
-}
-?>
+--INI--
+zend.multibyte=1
 --FILE--
 <?php
 
 declare(encoding = 1);
 declare(encoding = 1123131232131312321);
-declare(encoding = NULL);
 declare(encoding = M_PI);
 
 print 'DONE';
@@ -22,6 +17,4 @@ Warning: Unsupported encoding [%d] in %sdeclare_004.php on line 3
 
 Warning: Unsupported encoding [%f] in %sdeclare_004.php on line 4
 
-Warning: Unsupported encoding [] in %sdeclare_004.php on line 5
-
-Fatal error: Cannot use constants as encoding in %sdeclare_004.php on line 6
+Fatal error: Encoding must be a literal in %sdeclare_004.php on line 5
diff --git a/Zend/tests/each_003.phpt b/Zend/tests/each_003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Testing each() with recursion
+--INI--
+zend.enable_gc=1
 --FILE--
 <?php
 

diff --git a/Zend/tests/foreach_002.phpt b/Zend/tests/foreach_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Creating recursive array on foreach using same variable
+--INI--
+zend.enable_gc=1
 --FILE--
 <?php
 

diff --git a/Zend/tests/function_redecl.phpt b/Zend/tests/function_redecl.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Function redeclaration must produce a simple fatal
+--FILE--
+<?php
+function f() {}
+function f() {}
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare f() (previously declared in %s:%d) in %s on line %d
diff --git a/Zend/tests/gc_032.phpt b/Zend/tests/gc_032.phpt
@@ -1,5 +1,7 @@
 --TEST--
 GC 032: Crash in GC because of invalid reference counting
+--INI--
+zend.enable_gc=1
 --FILE--
 <?php
 $a = array();

diff --git a/Zend/tests/oct_overflow_32bit.phpt b/Zend/tests/oct_overflow_32bit.phpt
@@ -10,9 +10,9 @@ precision=14
 $doubles = array(
 	076545676543223,
 	032325463734,
-	077777797777777,
-	07777777777777977777777777,
-	03333333333333382222222222222,
+	0777777,
+	07777777777777,
+	033333333333333,
 	);
 
 foreach ($doubles as $d) {

diff --git a/Zend/tests/self_class_const_outside_class.phpt b/Zend/tests/self_class_const_outside_class.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Accessing self::FOO outside a class
+--FILE--
+<?php
+var_dump(self::FOO);
+?>
+--EXPECTF--
+Fatal error: Cannot access self:: when no class scope is active in %s on line %d
diff --git a/Zend/tests/varSyntax/parenthesesDeref.phpt b/Zend/tests/varSyntax/parenthesesDeref.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Dereferencing expression parentheses
+--INI--
+zend.enable_gc=1
 --FILE--
 <?php
 

diff --git a/Zend/zend.c b/Zend/zend.c
@@ -616,6 +616,9 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
 	zend_compile_string = compile_string;
 	zend_throw_exception_hook = NULL;
 
+	/* Set up the default garbage collection implementation. */
+	gc_collect_cycles = zend_gc_collect_cycles;
+
 	zend_init_opcodes_handlers();
 
 	/* set up version */