From: Joe Watkins <krakjoe@php.net>
Date: Fri, 4 Oct 2019 04:16:02 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0RC4~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74ca3a5cad36fe1ba4a0815df8409abfc99d0178;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  fix #78624: session_gc return value for user defined session handlers
---

74ca3a5cad36fe1ba4a0815df8409abfc99d0178
diff --cc NEWS
index 38f7a9fddc,dd1ffa2caa..8776ab5208
--- a/NEWS
+++ b/NEWS
@@@ -36,66 -20,44 +36,70 @@@ PH
    . Fixed bug #78609 (mb_check_encoding() no longer supports stringable
      objects). (cmb)
  
 -- MySQLi:
 -  . Fixed bug #76809 (SSL settings aren't respected when persistent connections 
 -    are used). (fabiomsouto)
 -
 -- Mysqlnd:
 -  . Fixed bug #78525 (Memory leak in pdo when reusing native prepared
 -    statements). (Nikita)
 -
 -- PCRE:
 -  . Fixed bug #78272 (calling preg_match() before pcntl_fork() will freeze
 -    child process). (Nikita)
 +- OpenSSL:
 +  . Changed the default config path (Windows only). (cmb)
  
+ - Session:
+   . Fixed bug #78624 (session_gc return value for user defined session 
+     handlers). (bshaffer)
+ 
  - Standard:
 -  . Fixed bug #76342 (file_get_contents waits twice specified timeout).
 -    (Thomas Calvet)
 -  . Fixed bug #78612 (strtr leaks memory when integer keys are used and the
 -    subject string shorter). (Nikita)
 -  . Fixed bug #76859 (stream_get_line skips data if used with data-generating 
 -    filter). (kkopachev)
 +  . Fixed bug #78549 (Stack overflow due to nested serialized input). (Nikita)
  
 -26 Sep 2019, PHP 7.3.10
 +19 Sep 2019, PHP 7.4.0RC2
  
  - Core:
 -  . Fixed bug #78220 (Can't access OneDrive folder). (cmb, ab)
 -  . Fixed bug #77922 (Double release of doc comment on inherited shadow
 -    property). (Nikita)
 -  . Fixed bug #78441 (Parse error due to heredoc identifier followed by digit).
 -    (cmb)
 -  . Fixed bug #77812 (Interactive mode does not support PHP 7.3-style heredoc).
 +  . Fixed incorrect usage of QM_ASSIGN instruction. It must not return IS_VAR.
 +    As a side effect, this allowed passing left hand list() "by reference",
 +    instead of compile-time error. (Dmitry)
 +  . Fixed bug #78531 (Crash when using undefined variable as object). (Dmitry)
 +  . Fixed bug #78535 (auto_detect_line_endings value not parsed as bool).
 +    (bugreportuser)
 +
 +- FFI:
 +  . Added missing FFI::isNull(). (Philip Hofstetter)
 +  . Fixed bug #78488 (OOB in ZEND_FUNCTION(ffi_trampoline)). (Dmitry)
 +
 +- Opcache:
 +  . Add opcache.preload_user INI directive. (Dmitry)
 +  . Fixed bug #78514 (Preloading segfaults with inherited typed property).
 +    (Nikita)
 +  . Fixed bug #78429 (opcache_compile_file(__FILE__); segfaults). (cmb)
 +
 +- PCRE:
 +  . Fixed bug #78349 (Bundled pcre2 library missing LICENCE file). (Peter Kokot)
 +
 +- PDO_Firebird:
 +  . Implemented FR #77863 (PDO firebird support type Boolean in input
 +    parameters). (Simonov Denis)
 +
 +- PDO_MySQL:
 +  . Fixed bug #41997 (SP call yields additional empty result set). (cmb)
 +
 +- sodium:
 +  . Fixed bug #78510 (Partially uninitialized buffer returned by
 +    sodium_crypto_generichash_init()). (Frank Denis, cmb)
 +  . Fixed bug #78516 (password_hash(): Memory cost is not in allowed range).
      (cmb, Nikita)
  
 -- FastCGI:
 -  . Fixed bug #78469 (FastCGI on_accept hook is not called when using named
 -    pipes on Windows). (Sergei Turchanov)
 +- Standard:
 +  . Fixed bug #78506 (Error in a php_user_filter::filter() is not reported).
 +    (Nikita)
 +
 +05 Sep 2019, PHP 7.4.0RC1
 +
 +- Core:
 +  . Fixed bug #77812 (Interactive mode does not support PHP 7.3-style heredoc).
 +    (cmb, Nikita)
 +  . Fixed bug #78438 (Corruption when __unserializing deeply nested structures).
 +    (cmb, Nikita)
 +  . Fixed bug #78441 (Parse error due to heredoc identifier followed by digit).
 +    (cmb)
 +  . Fixed bug #78454 (Consecutive numeric separators cause OOM error).
 +    (Theodore Brown)
 +  . Fixed bug #78335 (Static properties/variables containing cycles report as
 +    leak). (Nikita)
 +  . Fixed bug #78460 (PEAR installation failure). (Peter Kokot, L. Declercq)
  
  - FPM:
    . Fixed bug #78334 (fpm log prefix message includes wrong stdout/stderr
diff --cc ext/session/mod_user.c
index 981e920bc1,86c4bb0e30..b66ac26c81
--- a/ext/session/mod_user.c
+++ b/ext/session/mod_user.c
@@@ -189,16 -189,16 +189,15 @@@ PS_GC_FUNC(user
  	ps_call_handler(&PSF(gc), 1, args, &retval);
  
  	if (Z_TYPE(retval) == IS_LONG) {
- 		return Z_LVAL(retval);
 -		convert_to_long(&retval);
+ 		*nrdels = Z_LVAL(retval);
+ 	} else if (Z_TYPE(retval) == IS_TRUE) {
+ 		/* This is for older API compatibility */
+ 		*nrdels = 1;
+ 	} else {
+ 		/* Anything else is some kind of error */
+ 		*nrdels = -1; // Error
  	}
- 
- 	/* This is for older API compatibility */
- 	if (Z_TYPE(retval) == IS_TRUE) {
- 		return 1;
- 	}
- 
- 	/* Anything else is some kind of error */
- 	return -1; // Error
+ 	return *nrdels;
  }
  
  PS_CREATE_SID_FUNC(user)