From: Yasuo Ohgaki <yohgaki@php.net>
Date: Fri, 9 Sep 2016 02:39:40 +0000 (+0900)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC2~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17dbb916fc2245b90078c216c31c5ed732570c4c;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Update NEWS
  Fixed Bug #68015 Session does not report invalid uid for files save handler
---

17dbb916fc2245b90078c216c31c5ed732570c4c
diff --cc NEWS
index da420b7b5a,96e6bc20c2..1f50aeb259
--- a/NEWS
+++ b/NEWS
@@@ -23,10 -24,27 +23,14 @@@ PH
    . Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp()
      function). (Laruence)
  
 -- phpdbg:
 -  . Fixed bug #72996 (phpdbg_prompt.c undefined reference to DL_LOAD). (Nikita)
 -
+ - Session:
+   . Fixed bug #68015 (Session does not report invalid uid for files save handler).
+     (Yasuo)
+ 
 -- SOAP:
 -  . Fixed bug #71711 (Soap Server Member variables reference bug). (Nikita)
 -  . Fixed bug #71996 (Using references in arrays doesn't work like expected).
 -    (Nikita)
 -
 -- Standard:
 -  . Fixed bug #71882 (Negative ftruncate() on php://memory exhausts memory).
 -    (cmb)
 -
 -- Zip:
 -  . Fixed bug #70752 (Depacking with wrong password leaves 0 length files).
 -    (cmb)
 +- SQLite3:
 +  . Updated to SQLite3 3.14.1. (cmb)
  
 -15 Sep 2016 PHP 7.0.11
 +01 Sep 2016, PHP 7.1.0RC1
  
  - Core:
    . Fixed bug #72944 (Null pointer deref in zval_delref_p). (Dmitry)
diff --cc ext/session/tests/016.phpt
index f23605eb47,c1965df5cb..ce01c4d037
--- a/ext/session/tests/016.phpt
+++ b/ext/session/tests/016.phpt
@@@ -22,5 -22,9 +22,7 @@@ session_write_close()
  print "I live\n";
  ?>
  --EXPECTF--
- Warning: session_start(): Failed to read session data: files (path: 123;:/really%scompletely:::/invalid;;,23123;213) in %s on line %d
- I live
+ Warning: session_start(): Failed to create session data file path. Too short session ID, invalid save_path or path lentgth exceeds MAXPATHLEN(%d) in %s on line 4
+ 
 -Warning: session_write_close(): Failed to create session data file path. Too short session ID, invalid save_path or path lentgth exceeds MAXPATHLEN(%d) in %s on line 6
 -
 -Warning: session_write_close(): Failed to write session data (files). Please verify that the current setting of session.save_path is correct (123;:/really\completely:::/invalid;;,23123;213) in %s on line 6
++Warning: session_start(): Failed to read session data: files (path: 123;:/really\completely:::/invalid;;,23123;213) in %s on line 4
+ I live