php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
106,924 Commits 549 Branches 1,485 Tags
dcbac8ade6d45ee4a34dfaec0f20aa7700e84dad
Commit Graph

106924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov dcbac8ade6 Fixed use-after-free. 2018-03-07 10:21:51 +03:00
Dmitry Stogov 228687362c Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-03-07 00:53:50 +03:00
Anatol Belski 7febfe068a Merge branch 'PHP-7.2' 
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-03-06 22:08:49 +01:00
Anatol Belski 7780bfc7b3 [ci skip] Update NEWS 2018-03-06 22:07:58 +01:00
Anatol Belski 000e35db81 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-03-06 22:07:31 +01:00
Anatol Belski 8a57fcdfbd [ci skip] Update NEWS 2018-03-06 22:06:52 +01:00
Dmitry Stogov a2d1f2df46 Eliminate conditional branches 2018-03-07 00:03:13 +03:00
Dmitry Stogov a4109e1f4c Added expectation 2018-03-06 23:22:01 +03:00
Dmitry Stogov 856b63a632 Avoid double copying 2018-03-06 21:59:02 +03:00
Dmitry Stogov 9716bd68a3 Avoid double copying 2018-03-06 21:58:40 +03:00
Dmitry Stogov d03e95442a Use reference counting instead of duplication 2018-03-06 21:20:19 +03:00
Dmitry Stogov 4d75504d4f Avoid double copying and string length recalculation 2018-03-06 21:19:18 +03:00
Christoph M. Becker a98eb1ec2c [ci skip] Fix reference notation in protos 2018-03-06 13:22:39 +01:00
Gabriel Caruso b47b3596ef [ci skip] Use float instead of double in proto 2018-03-06 13:16:18 +01:00
Dmitry Stogov c060d88c36 Fixed bug #76050 2018-03-06 03:31:06 +03:00
Dmitry Stogov 44e1d2f8a9 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.
 2018-03-06 03:00:46 +03:00
Dmitry Stogov 020a02ef9d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.
 2018-03-06 02:47:01 +03:00
Dmitry Stogov 50949c9332 Replaced usafe reference from SHM to process memory with SHM to SHM reference. 2018-03-06 02:43:26 +03:00
Dmitry Stogov 47f5f87826 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 01:02:31 +03:00
Dmitry Stogov b48d2f6d10 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 01:00:14 +03:00
Dmitry Stogov b711a96acb Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). 
Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 00:56:16 +03:00
Dmitry Stogov 033ce8f28c Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:php-src:
  Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
 2018-03-06 00:47:40 +03:00
Dmitry Stogov d740024e35 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed invalid destructor
 2018-03-06 00:47:05 +03:00
Dmitry Stogov b7ebf90221 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid destructor
 2018-03-06 00:46:40 +03:00
Dmitry Stogov a83581e223 Fixed invalid destructor 2018-03-06 00:46:19 +03:00
Anatol Belski 5c41de2e1d Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
 2018-03-05 22:39:06 +01:00
Anatol Belski b53f326f67 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
 2018-03-05 22:38:03 +01:00
Anatol Belski 60ac255897 Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD 2018-03-05 22:35:58 +01:00
Dmitry Stogov d9d30a7f38 AST is not COPYABLE anymore and its reference-counter doesn't have to be initialized by 2. 2018-03-06 00:30:25 +03:00
Dmitry Stogov 84a0423e05 Set and keep HASH_FLAG_STATIC_KEYS for all HashTables stored in SHM (or file cache). 2018-03-06 00:00:13 +03:00
Dmitry Stogov d76061d5c1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed invalid destructor
 2018-03-05 23:38:15 +03:00
Dmitry Stogov 53baf6fa1d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid destructor
 2018-03-05 23:33:53 +03:00
Dmitry Stogov 87553b0730 Fixed invalid destructor 2018-03-05 23:33:08 +03:00
Dmitry Stogov 877da311bc Typo 2018-03-05 20:45:26 +03:00
Dmitry Stogov ab139b6bfd Reverted e6d6fcedf7 and overdesign introduced in ae64dd6d56. 
Now we have just indexex, pointers and linked list od unused buffers.
 2018-03-05 20:20:58 +03:00
Nikita Popov a0563aa7bc Fix incorrect GC_NUM2ADDR usage 
Both first_unused and GC_MAX_UNCOMPRESSED are addresses, so we
should compare them directly.
 2018-03-05 16:29:46 +01:00
Nikita Popov 4838e9799f Merge branch 'PHP-7.2' 2018-03-05 15:33:34 +01:00
Nikita Popov 634a1ff033 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-05 15:32:39 +01:00
Nikita Popov fd5bd37ab1 Revert "Fixed bug #75961 (Strange references behavior)" 
This reverts commit 94e9d0a2ae.

This code needs to be mindful about modifications to the array
happening during callback execution. It was written in a way that
only accessed the reference, which is guaranteed not to move. The
changed implementation instead accesses the array slot, leading to
use-after-free.

Run ext/standard/tests/array/bug61967.phpt under valgrind to see
the issue.
 2018-03-05 15:32:21 +01:00
Anatol Belski cf84e5a529 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Include username into the file cache path
 2018-03-05 15:22:11 +01:00
Anatol Belski 54212dfbf9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Include username into the file cache path
 2018-03-05 15:21:31 +01:00
Anatol Belski 27a603e811 Include username into the file cache path 2018-03-05 15:16:55 +01:00
Dmitry Stogov f32b7dbc43 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed "opcache.file_cache_fallback" mode.
 2018-03-05 16:21:20 +03:00
Dmitry Stogov a8fbb15311 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed "opcache.file_cache_fallback" mode.
 2018-03-05 16:15:38 +03:00
Dmitry Stogov 350082ed71 Fixed "opcache.file_cache_fallback" mode. 
It's not safe to change value of ZCG(accel_directives).file_cache_only, becuse it might be altered by INI subsystem.
Use global variable instead.
 2018-03-05 16:01:43 +03:00
Dmitry Stogov 6c035f53f1 Separate duplicated code into a zend_ini_parse_bool() function. 2018-03-05 11:51:58 +03:00
Anatol Belski 10549ac62d Fix empty value 2018-03-02 23:10:02 +01:00
Anatol Belski c7dc6cc66b Reflect native instruction set in snap filename 2018-03-02 20:39:41 +01:00
Anatol Belski fd5a635225 Add intrinsics info to configure output 2018-03-02 18:12:14 +01:00
Christoph M. Becker eeda55cb3b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #76041: null pointer access crashed php
 2018-03-02 17:21:04 +01:00