mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-13 20:05:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
109,977 Commits 503 Branches 1,384 Tags 812 MiB
9b9814fa77
Commit Graph

109977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Golemon
9b9814fa77
Revert "Move to non deprecated API on suitable ICU versions" 
This reverts commit 13a2f2d041.

The APIs used by this commit aren't entirely equivalent to the original ones.
 2019-08-16 11:39:05 -04:00
Christoph M. Becker
4966647443 Update NEWS 
This fix has been cherry-picked into PHP-7.3.9.
 2019-08-15 15:28:52 +02:00
Christoph M. Becker
8fb297cd82 Update credits_ext.h 2019-08-14 19:24:16 +02:00
Nikita Popov
1166359acb Merge branch 'PHP-7.2' into PHP-7.3 2019-08-14 17:51:35 +02:00
Nikita Popov
fcabe7e5e4 Fixed bug #78412 
$this should only be included in the generator GC buffer, if it
will be released on destruction.
 2019-08-14 17:50:58 +02:00
Sara Golemon
e5da73d1f2 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Bump for 7.2.23
 2019-08-13 19:34:12 -04:00
Sara Golemon
4b64d47c99
Bump for 7.2.23 2019-08-13 19:32:12 -04:00
Christoph M. Becker
5536105b67 Next will be 7.3.10 2019-08-13 23:57:48 +02:00
Christoph M. Becker
fe7997912d Bump version numbers 
This should have been done four weeks ago already.
 2019-08-13 23:23:43 +02:00
Nikita Popov
a33361a37c Merge branch 'PHP-7.2' into PHP-7.3 2019-08-13 11:22:41 +02:00
Nikita Popov
4eeb41d1ea Fixed bug #77191 2019-08-13 11:19:58 +02:00
Nikita Popov
7ba54b9822 Merge branch 'PHP-7.2' into PHP-7.3 2019-08-13 09:54:26 +02:00
Nikita Popov
18f2918a0f Don't destroy properties array with unset GC type 
As the properties array can also be a GC root, it might have
already been destroyed.
 2019-08-13 09:53:25 +02:00
Nikita Popov
4cd563d07e Merge branch 'PHP-7.2' into PHP-7.3 2019-08-12 17:17:30 +02:00
Nikita Popov
f3fdf570b3 Intern alias old_name early 
This is likely going to end up interned lateron at some point
when the new_name is referenced somewhere. However, it may be
that there are some uses that do not get interned before that.
In this case we will intern a string that already have zval
users, without updating the refcounted flag on those zvals.

In particular this can happen with something like [Foo::class],
where Foo is an imported symbol. The string it resolves to won't
get interned right away, but may be interned later.

    use Foo as Bar;
    $x = [Bar::class];
    var_dump(Bar::X);
    debug_zval_dump($x); // Will show negative refcount
    class Foo {
        const X = 1;
    }

However, this doesn't really fix the root cause, there are probably
other situations where something similar can occur.
 2019-08-12 17:12:28 +02:00
Derick Rethans
7aa1dd3ba1 Updated to version 2019.2 (2019b) 2019-08-11 16:05:58 +01:00
Dmitry Stogov
722a44d515 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed handling of references in nested data of objects with destructor
 2019-08-09 17:47:06 +03:00
Dmitry Stogov
9b43e29d9b Fixed handling of references in nested data of objects with destructor 2019-08-09 17:43:50 +03:00
Dmitry Stogov
22d23e08c9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)
 2019-08-09 15:58:16 +03:00
Dmitry Stogov
6b1cc1252e Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash) 2019-08-09 15:42:39 +03:00
Dmitry Stogov
21a0a28fd0 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Added asserts to catch GC errors when refcount goes below zero.
 2019-08-09 13:39:59 +03:00
Dmitry Stogov
2e2cd65d73 Added asserts to catch GC errors when refcount goes below zero. 2019-08-09 13:37:23 +03:00
Matteo Beccati
5ef1a30aaf Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Skip test when SIGKILL is not defined
 2019-08-09 10:32:56 +02:00
Matteo Beccati
796efd849e Skip test when SIGKILL is not defined 2019-08-09 10:32:15 +02:00
Nikita Popov
38f10ff5cf Fix GC tracing 
Due to the GC changes in 7.3 we stopped tracing most of the
interesting coloring changes...
 2019-08-08 10:54:18 +02:00
Dmitry Stogov
bff2743caf Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #78379 (Cast to object confuses GC, causes crash)
 2019-08-08 10:05:59 +03:00
Dmitry Stogov
358379be22 Fixed bug #78379 (Cast to object confuses GC, causes crash) 2019-08-08 10:00:39 +03:00
Christoph M. Becker
9ea39d15ab Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78282: atime and mtime mismatch
 2019-08-06 17:28:11 +02:00
Christoph M. Becker
954543cec6 Fix #78282: atime and mtime mismatch 
The fix for bug #78241 assumed that `time_t` would always be 64bit, but
actually is 32bit for x86.  We therefore enforce 64bit arithmetic to
avoid wrapping.

(cherry picked from commit bf242d58e7)
 2019-08-06 17:25:54 +02:00
Christoph M. Becker
a87ef5e3dd Fix #78346: strip_tags no longer handling nested php tags 
When the strip tags state machine has been flattened, an if statement
has mistakenly been treated as else if.  We fix this, and also simplify
a bit right away.
 2019-08-02 17:03:20 +02:00
Christoph M. Becker
81efd489db Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78179: MariaDB server version incorrectly detected
 2019-08-02 16:44:15 +02:00
Christoph M. Becker
f9f4a68368 Fix #78179: MariaDB server version incorrectly detected 
As of MariaDB 10.0.2, the server reports a fake version number as work-
around for replication issues[1].  We apply the same "fix" as in the
MariaDB client to cater to this.

[1] <c50ee6c23d (diff-5b45fa673c88c06a9651c7906364f592)>
 2019-08-02 16:42:49 +02:00
Nikita Popov
d89157cd67 Add test for bug #78363 2019-08-02 10:37:44 +02:00
Nikita Popov
e1934f8515 Merge branch 'PHP-7.2' into PHP-7.3 2019-08-02 10:35:48 +02:00
Nikita Popov
85e8ccd55e Fixed bug #78363 2019-08-02 10:35:24 +02:00
Christoph M. Becker
b419b24ead Remove upgrade-pcre.php script 
This script has not been updated for PCRE2, and it's mostly useless
anyway.  Therefore we remove it altogether.
 2019-08-01 10:49:05 +02:00
Christoph M. Becker
8af14024c2 Fix 78213: Empty row pocket 
We have to ensure that we don't create an arena which is smaller than
its header, regardless of the configured alignment.
 2019-07-31 18:05:40 +02:00
Christoph M. Becker
ef439abd46 Add security related NEWS entries [ci skip] 2019-07-30 09:49:39 +02:00
Remi Collet
6ea13baaf1 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  add security NEW entries + reorder [ci skip]
 2019-07-30 09:27:06 +02:00
Remi Collet
b29ecec4ef add security NEW entries + reorder [ci skip] 2019-07-30 09:26:50 +02:00
Christoph M. Becker
8947fd9e9f Fix #78338: Array cross-border reading in PCRE 
We backport r1092 from pcre2.
 2019-07-29 14:49:33 -07:00
Stanislav Malyshev
d69894734d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 2019-07-29 13:20:44 -07:00
Stanislav Malyshev
284fb08fdc Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 2019-07-29 13:19:16 -07:00
Christoph M. Becker
cd1101e8c8 Fix #77919: Potential UAF in Phar RSHUTDOWN 
We have to properly clean up in case phar_flush() is failing.

We also make the expectation of the respective test case less liberal
to avoid missing such bugs in the future.
 2019-07-29 13:18:27 -07:00
Stanislav Malyshev
42e8b85d94 Update NEWS 2019-07-29 13:16:53 -07:00
Nikita Popov
44fe025c28 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 17:34:16 +02:00
Albert Casademont
dc7aa22b18 Fix bug #78326 
Similar to what fread() does, truncate the stream_get_contents()
result if the original buffer was way too large.
 2019-07-29 17:33:57 +02:00
Nikita Popov
bbed5564eb Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 16:57:57 +02:00
Nikita Popov
38f1288b64 Fix Zend signals unblocking 
There are a few parts here:
 * opcache should not be blocking signals while invoking compile_file,
   otherwise signals may remain blocked on a compile error. While at
   it, also protect SHM memory during compile_file.
 * We should deactivate Zend signals at the end of the request, to make
   sure that we gracefully recover from a missing unblock and signals
   don't remain blocked forever.
 * We don't use a critical section in deactivation, because it should
   not be necessary. Additionally we want to clean up the signal queue,
   if it is non-empty.
 * Enable SIGG(check) in debug builds so we notice issues in the future.
 2019-07-29 15:17:32 +02:00
Christoph M. Becker
76683ea999 Update NEWS [ci skip] 
The fix has been cherry-picked into PHP-7.3.8, so the bug will be fixed
already there.
 2019-07-29 14:48:23 +02:00