mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-07 03:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
113,148 Commits 505 Branches 1,389 Tags 835 MiB
aee31dd7e4
Commit Graph

113148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikita Popov
34885408db Fixed bug #78409 
This removes an incorrect optimization (I think this code used to be
necessary to properly handle references in the Serializable based
implementation, but now this code just avoids an array duplication
in a way that is not sound).
 2019-08-15 10:40:28 +02:00
Christoph M. Becker
65ea6bbdc6 Empty merge 2019-08-14 19:25:48 +02:00
Christoph M. Becker
8fb297cd82 Update credits_ext.h 2019-08-14 19:24:16 +02:00
Nikita Popov
80a2bfafa4 Merge branch 'PHP-7.3' into PHP-7.4 2019-08-14 17:53:24 +02:00
Nikita Popov
c238b5bbef Fix reference printing in GC tracing 2019-08-14 17:51:41 +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
2f13f65706 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Bump for 7.2.23
 2019-08-13 19:34:26 -04: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
2781e54ef1 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Next will be 7.3.10
 2019-08-14 00:48:49 +02:00
Christoph M. Becker
5536105b67 Next will be 7.3.10 2019-08-13 23:57:48 +02:00
Christoph M. Becker
f25eee2c56 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Bump version numbers
 2019-08-13 23:26:29 +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
d891b5f458 Fixed bug #78410 2019-08-13 20:23:56 +02:00
Nikita Popov
b0394ba0e5 Add myself to extension maintainer list 
Year ranges are wild guesses.
 2019-08-13 16:08:04 +02:00
Nikita Popov
60a7e60b61 Fixed bug #72530 
For objects with destructors, we will now only call the destructor
in the initial GC run, and remove any nested data. The object is
marked purple so it will be considered a root for the next GC run,
at which point it will be fully destroyed, if possible.

GC counts change on a number of tests, as the objects now get
destroyed later.
 2019-08-13 14:53:53 +02:00
Nikita Popov
fdfc7ea932 Don't return persistent string from get_cfg_var() 
This is not thread-safe.
 2019-08-13 14:50:01 +02:00
Nikita Popov
201729840c Mark PCRE locale key as local persistent 2019-08-13 14:49:59 +02:00
Christoph M. Becker
eb25176ab3 Remove dead code 2019-08-13 13:29:11 +02:00
Nikita Popov
bc690d63f6 Adjust GC count in SPL test 2019-08-13 12:34:48 +02:00
Nikita Popov
72b7d99d0d Remove removed nested data from GC count 2019-08-13 12:17:08 +02:00
Nikita Popov
f0f3fe0b6c Don't include non-refcounted structures in GC count 2019-08-13 12:08:59 +02:00
Nikita Popov
7bd2b9d2e6 Generalize delref assertion 
The refcount should never become negative, not just during GC.
 2019-08-13 11:44:54 +02:00
Nikita Popov
76fecb339f Merge branch 'PHP-7.3' into PHP-7.4 2019-08-13 11:23:06 +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
b01824e596 Fixed bug #78406 2019-08-13 10:22:32 +02:00
Nikita Popov
bdf3fa8c3e Merge branch 'PHP-7.3' into PHP-7.4 2019-08-13 09:54:44 +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
Christoph M. Becker
ce646357bf Fix WS 2019-08-12 17:59:30 +02:00
Nikita Popov
b6f1b61f8f Merge branch 'PHP-7.3' into PHP-7.4 2019-08-12 17:17:42 +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
Christoph M. Becker
b1189b18d2 Add missing argument checks 
These functions don't expect any arguments, so we should check that
none are given.
 2019-08-12 15:36:35 +02:00
Nikita Popov
a18ad194c4 Fixed bug #78396 2019-08-12 10:45:13 +02:00
Derick Rethans
f465560a0f Updated to version 2019.2 (2019b) 2019-08-11 16:05:59 +01:00
Derick Rethans
7da140b58e Empty merge 2019-08-11 16:05:59 +01:00
Derick Rethans
7aa1dd3ba1 Updated to version 2019.2 (2019b) 2019-08-11 16:05:58 +01:00
Christoph M. Becker
9818f863c3 Fix parameter order 
`imagecopymerge()` and `imagecopymergegray()` expect the destination
image first, not the other way round.
 2019-08-11 16:16:39 +02:00
Christoph M. Becker
092571c1cb Extend color component range checks 
We also check for alpha components to be within range, and we add yet
missing range checks for other functions as well.
 2019-08-11 15:21:05 +02:00
Dmitry Stogov
4ebf527136 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed handling of references in nested data of objects with destructor
 2019-08-09 17:47:35 +03: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
Nikita Popov
7b152990b6 Don't short-circuit MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE 
Make sure we always go through mbfl_filt_conv_illegal_output(), so
that the number of illegal characters gets counted.
 2019-08-09 16:33:21 +02:00
Nikita Popov
699b465da2 Fixed bug #78391 2019-08-09 15:03:40 +02:00
Dmitry Stogov
1456467cfe Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)
 2019-08-09 15:58:33 +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