Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #69582 session not readable by root in CLI

Author: krakjoe

NEWS

@@ -86,6 +86,7 @@ PHP                                                                        NEWS
   . Fixed bug #73461 (Prohibit session save handler recursion). (Yasuo)
   . PR #2233 Removed register_globals related code and "!" can be used as $_SESSION key name. (Yasuo)
   . Improved bug #73100 fix. 'user' save handler can only be set by session_set_save_handler()
+  . Fixed bug #69582 (session not readable by root in CLI). (EvgeniySpinov)
 
 - SOAP:
   . Fixed bug #69137 (Peer verification fails when using a proxy with SoapClient)

ext/session/mod_files.c

@@ -196,8 +196,14 @@ static void ps_files_open(ps_files *data, const char *key)
 		if (data->fd != -1) {
 #ifndef PHP_WIN32
 			/* check that this session file was created by us or root – we
-			   don't want to end up accepting the sessions of another webapp */
-			if (fstat(data->fd, &sbuf) || (sbuf.st_uid != 0 && sbuf.st_uid != getuid() && sbuf.st_uid != geteuid())) {
+			   don't want to end up accepting the sessions of another webapp
+
+			   If the process is ran by root, we ignore session file ownership
+			   Use case: session is initiated by Apache under non-root and then
+			   accessed by backend with root permissions to execute some system tasks.
+
+			   */
+			if (zend_fstat(data->fd, &sbuf) || (sbuf.st_uid != 0 && sbuf.st_uid != getuid() && sbuf.st_uid != geteuid() && getuid() != 0)) {
 				close(data->fd);
 				data->fd = -1;
 				php_error_docref(NULL, E_WARNING, "Session data file is not created by your uid");