php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
112,926 Commits 549 Branches 1,485 Tags
bc690d63f6d2f10bc1cff89cb4dfd7589c3b012c
Commit Graph

112926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 b2044cd93e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Added asserts to catch GC errors when refcount goes below zero.
 2019-08-09 13:40: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 5c8124d311 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Skip test when SIGKILL is not defined
 2019-08-09 10:33:15 +02: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
Matteo Beccati 00dd786ba4 Fix test when default TZ is not UTC 2019-08-09 09:58:10 +02:00
Nikita Popov d9dc942011 Merge branch 'PHP-7.3' into PHP-7.4 2019-08-08 10:55:02 +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
Nikita Popov 8a4171ac45 Add UPGRADING note about stream_set_option() and includes 
[ci skip]
 2019-08-08 10:12:16 +02:00
Nikita Popov fc17bfaacf Fixed bug #78383 2019-08-08 09:55:52 +02:00
Dmitry Stogov 720438c8ee Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #78379 (Cast to object confuses GC, causes crash)
 2019-08-08 10:07:39 +03: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 be794894ef Fix detection of pg_config.h 
pg_config.h is supposed to be placed right besides libpq-fe.h, so we
should check the same paths.
 2019-08-07 13:25:07 +02:00
Christoph M. Becker ae91f8572e Skip test if ext/json is not available 
Otherwise the test fails.
 2019-08-07 13:04:13 +02:00
Christoph M. Becker 886be260cb Make extension compatibility check more liberal 
Checking for the exact linker version appears to be too restrictive; it
should be fine if the tens match.

We also refactor to avoid repeating ourselves.
 2019-08-07 11:31:12 +02:00
Christoph M. Becker 968ed124b2 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78282: atime and mtime mismatch
 2019-08-06 17:28:36 +02: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