Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78641: addGlob can modify given remove_path value

diff --cc NEWS
index e96d2f4d4381b076f2e1990d9c1d1f17330d5107,cbd309a722fe7b4a141baf87a248b90afdcaf876..28e399d3b46bf85767ce4bbc62271ea11d6a68b8
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -29,88 -45,27 +29,91 @@@ PH
    . Fixed bug #76859 (stream_get_line skips data if used with data-generating 
      filter). (kkopachev)
  
 -26 Sep 2019, PHP 7.3.10
+ - Zip:
+   . Fixed bug #78641 (addGlob can modify given remove_path value). (cmb)
+ 
 +03 Oct 2019, PHP 7.4.0RC3
  
  - 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).
 +  . Fixed bug #78604 (token_get_all() does not properly tokenize FOO<?php with
 +    short_open_tag=0). (Nikita)
 +
 +- FFI:
 +  . Fixed bug #78543 (is_callable() on FFI\CData throws Exception). (cmb)
 +
 +- GMP:
 +  . Fixed bug #78574 (broken shared build). (Remi)
 +
 +- MBString:
 +  . Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).
      (cmb)
 -  . Fixed bug #77812 (Interactive mode does not support PHP 7.3-style heredoc).
 +  . Fixed bug #78609 (mb_check_encoding() no longer supports stringable
 +    objects). (cmb)
 +
 +- 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 #78549 (Stack overflow due to nested serialized input). (Nikita)
 +
 +19 Sep 2019, PHP 7.4.0RC2
 +
 +- Core:
 +  . 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/zip/php_zip.c
index 8b25d7dcbd911901fb343e5ce3d02a3b036a62a1,e607f0f0771c399c7ff9f1c98bfb0dd352df3060..966efb58e6980aee1704ea429104562d0c01fdb3
--- 1/ext/zip/php_zip.c
--- 2/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@@ -1643,9 -1668,9 +1643,9 @@@ static ZIPARCHIVE_METHOD(addEmptyDir
  static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
  {
        struct zip *intern;
 -      zval *self = getThis();
 +      zval *self = ZEND_THIS;
        char *path = ".";
-       char *remove_path = NULL;
+       char *remove_path = NULL, *save_remove_path;
        char *add_path = NULL;
        size_t  add_path_len, remove_path_len = 0, path_len = 1;
        zend_long remove_all_path = 0;