archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
139815 commits 526 branches 1434 tags 864 MiB
Commit graph

244 commits

Author SHA1 Message Date
Nikita Popov
fa8565a0f1 Merge branch 'PHP-7.3' into PHP-7.4 2019-08-26 17:52:56 +02:00
Nikita Popov
461db52400 Merge branch 'PHP-7.2' into PHP-7.3 2019-08-26 17:52:37 +02:00
Nikita Popov
589542f50c Remove properties HT from nested GC data 
The properties HT may be a GC root itself, so we need to remove it.
I'm not sure this issue actually applies to PHP 7.2, but committing
it there to be safe. As seen from the test case, the handling here
is rather buggy on 7.2.
 2019-08-26 17:49:37 +02:00
Nikita Popov
ded28e2435 Merge branch 'PHP-7.4' 2019-08-14 17:53:38 +02:00
Nikita Popov
c238b5bbef Fix reference printing in GC tracing 2019-08-14 17:51:41 +02:00
Nikita Popov
8c927442b4 Merge branch 'PHP-7.4' 2019-08-13 14:54:57 +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
1ae0b68404 Merge branch 'PHP-7.4' 2019-08-13 12:17:47 +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
9af705e753 Merge branch 'PHP-7.4' 2019-08-13 11:45:16 +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
Dmitry Stogov
172c71980d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed handling of references in nested data of objects with destructor
 2019-08-09 17:47:50 +03: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
Dmitry Stogov
a037a5bd33 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)
 2019-08-09 15:58:44 +03: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
9b973550b9 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Added asserts to catch GC errors when refcount goes below zero.
 2019-08-09 13:40:56 +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
Nikita Popov
e22633c4a7 Merge branch 'PHP-7.4' 2019-08-08 10:55:07 +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
Dmitry Stogov
4d9e5ddf7c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Don't set GC_HAS_DESTRUCTORS flag if destructors were already called
  Update NEWS for 7.4.0beta3
  Update NEWS for PHP 7.4.0beta2
 2019-08-06 11:37:08 +03:00
Dmitry Stogov
170a3f871f Don't set GC_HAS_DESTRUCTORS flag if destructors were already called 2019-08-06 11:35:53 +03:00
Nikita Popov
25985fedcf Merge branch 'PHP-7.4' 2019-07-15 13:49:36 +02:00
Nikita Popov
d60d16bda6 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-15 13:49:29 +02:00
Nikita Popov
193f28c7d5 Fixed bug #78010 
Prevent the gc_info from becoming all zero for a registered root
by setting the top bit to one for compressed root addresses.
 2019-07-15 12:00:30 +02:00
Nikita Popov
3645292235 Merge branch 'PHP-7.4' 2019-06-19 15:09:39 +02:00
Nikita Popov
3d4298697b Fix shift UB in constants 
We were shifting out the top bit of a signed integer.
 2019-06-19 15:09:00 +02:00
Peter Kokot
90654aff31 Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix a spell mistake
 2019-04-10 10:45:31 +02:00
ROVAST
231fecee27 fix a spell mistake 
possbile => possible
 2019-04-10 10:45:13 +02:00
Dmitry Stogov
2dd2dcaf9c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.
 2019-03-14 03:02:10 +03:00
Dmitry Stogov
9499484ed2 Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc. 2019-03-14 03:01:01 +03:00
Dmitry Stogov
4111daf2b4 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Better data packing
 2019-03-12 22:19:36 +03:00
Dmitry Stogov
824a933398 Better data packing 2019-03-12 22:19:11 +03:00
Dmitry Stogov
24378d1809 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #77345 (Stack Overflow caused by circular reference in garbage collection)
  Add support for MemorySanitizer
 2019-03-07 13:58:42 +03:00
Dmitry Stogov
2f2d15791a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #77345 (Stack Overflow caused by circular reference in garbage collection)
 2019-03-07 13:53:43 +03:00
Dmitry Stogov
5da591c529 Fixed bug #77345 (Stack Overflow caused by circular reference in garbage collection) 2019-03-07 13:33:19 +03:00
Peter Kokot
18295b396f Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix typos in code comments in Zend/ [skip ci]
 2019-02-18 17:56:38 +01:00
Tyson Andre
da3316ff0f Fix typos in code comments in Zend/ [skip ci] 2019-02-18 17:56:28 +01:00
Dmitry Stogov
91ef4124e5 Refactor zend_object_handlers API to pass zend_object* and zend_string* insted of zval(s). 2019-02-04 13:20:25 +03:00
Peter Kokot
92ac598aab Remove local variables 
This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.

A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.

This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.

With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.

Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files.  All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.
 2019-02-03 21:03:00 +01:00
Zeev Suraski
a81202ac49 Adios, yearly copyright ranges 2019-01-30 11:48:28 +01:00
Zeev Suraski
9afce019e0 Future-proof email addresses 2018-11-01 18:35:32 +02:00
Zeev Suraski
54dc07f3dc Update email addresses. We're still @Zend, but future proofing it... 2018-11-01 17:20:07 +02:00