clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
109,540 Commits 491 Branches 1,363 Tags 846 MiB
d2d1a50b04
Commit Graph

109540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
d2d1a50b04 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix potential OPcache file cache related issues
 2019-04-11 18:30:27 +02:00
Anatol Belski
5477d68300 Fix potential OPcache file cache related issues 
To solve issues detected during testing, we backport the following
commits to PHP 7.2:

129c5c1181
9ac133a0b3
ce72bc6b65
 2019-04-11 18:28:49 +02:00
Nikita Popov
a61d24e4d8 Avoid onig match param unused variable warning 2019-04-11 12:35:24 +02:00
Anatol Belski
ce72bc6b65 Ensure double slashes are replaced by the path normalization 2019-04-10 15:20:36 +02:00
Anatol Belski
1aa30bb71c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix phar:// include handling with file cache
 2019-04-10 14:56:29 +02:00
Anatol Belski
f31d7ca85e Fix phar:// include handling with file cache 2019-04-10 14:55:15 +02:00
Nikita Popov
b67ca4f07c Merge branch 'PHP-7.2' into PHP-7.3 2019-04-10 13:06:55 +02:00
Nikita Popov
8f13599a64 Fix 29nb_async_connect.phpt 
Intermediate states are unreliable across versions (I think), make
sure we go through the whole connect procedure.
 2019-04-10 13:06:02 +02:00
Nikita Popov
6615b9c287 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-10 12:22:34 +02:00
Nikita Popov
c7a86a38a3 Fix pgsql use after free trying to reuse closed connection 
When a connection is closed, we also need to remove the hash entry
from the regular_list, as it now points to freed memory. To do this
store a reverse mapping from the connection to the hash string.

It would be nicer to introduce a wrapping structure for the pgsql
link resource that could store the hash (and notices), but that would
require large changes to the extension, so I'm going for a more
minimal fix here.
 2019-04-10 12:18:57 +02:00
Nikita Popov
ed1df9d135 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-10 10:38:32 +02:00
Nikita Popov
b55715d61a Fix use after free on pg_close() of default connection 2019-04-10 10:38:24 +02:00
Dmitry Stogov
8e5a2096a9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Repare SWITCH VM
 2019-04-09 01:11:02 +03:00
Dmitry Stogov
7b8212f4d1 Repare SWITCH VM 2019-04-09 00:41:11 +03:00
Nikita Popov
a90ac8b5b2 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-08 13:00:05 +02:00
twosee
bdac9ef10d Preserve keys in emulate_read_fd_set() 
Keys are already preserved in the non-emulated case.
 2019-04-08 12:58:46 +02:00
Nikita Popov
08a3062816 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-08 11:41:48 +02:00
Nikita Popov
d7b5954f28 Fixed bug #77853 2019-04-08 11:40:50 +02:00
Nikita Popov
0a25b41f6d Merge branch 'PHP-7.2' into PHP-7.3 2019-04-08 11:12:52 +02:00
Nikita Popov
eea61cda7d Fixed bug #77844 
We should probably return an integer result from the operation in
typed mode, right now the result is always a string.
 2019-04-08 11:11:58 +02:00
Stanislav Malyshev
805a330681 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Always use ZEND_SECURE_ZERO() when cleaning up data
  bump versions after release
 2019-04-06 19:06:16 -07:00
Stanislav Malyshev
d1d692abe7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Always use ZEND_SECURE_ZERO() when cleaning up data
  bump versions after release
 2019-04-06 19:05:37 -07:00
Stanislav Malyshev
588db7cecf Always use ZEND_SECURE_ZERO() when cleaning up data 
Optimizing compilers have an annoying tendency to throw out
memsets over data that they think aren't used anymore. Apply secure
zero-out in cases where this has potential to happen.
 2019-04-06 18:15:42 -07:00
Joe Watkins
0c6a68fa36
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Follow up #77849 PDOStatement objects in undefined state after clone
 2019-04-06 01:27:58 +02:00
Joe Watkins
a2b8a62abf
Follow up #77849 PDOStatement objects in undefined state after clone 2019-04-06 01:26:47 +02:00
Joe Watkins
0d5be6ce91
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77849 Disable cloning of PDO handle/connection objects to avoid segfault
 2019-04-06 00:55:46 +02:00
Cameron Porter
9ec1525eb5
Fix bug #77849 Disable cloning of PDO handle/connection objects to avoid segfault 2019-04-06 00:54:59 +02:00
Christoph M. Becker
31fe6cfe76 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update Appveyor CI to php-sdk-2.2.0beta4
 2019-04-05 23:15:50 +02:00
Christoph M. Becker
7b0ed8975d Update Appveyor CI to php-sdk-2.2.0beta4 2019-04-05 23:15:22 +02:00
Christoph M. Becker
54bed8d2ea Fix typos 2019-04-04 14:22:36 +02:00
Matteo Beccati
9f02f9fd5c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Ref #76801 remove old file source from file_sources hash in case of file included more than once
 2019-04-03 14:36:11 +02:00
Alessandro Chitolina
4029c0b6a2 Ref #76801 remove old file source from file_sources hash in case of file included more than once 2019-04-03 14:35:57 +02:00
Dmitry Stogov
0f811bb7b6 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed CFG construction for SWITCH opcodes
 2019-04-03 03:09:47 +03:00
Dmitry Stogov
56a5d0bd91 Fixed CFG construction for SWITCH opcodes 2019-04-03 03:09:03 +03:00
Christoph M. Becker
849c49a714 Update NEWS 2019-04-02 16:54:15 +02:00
Joe Watkins
731eeb8dec
bump versions after release 2019-04-02 16:50:20 +02:00
Remi Collet
002983e463 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix paste issue
 2019-04-02 11:05:54 +02:00
Remi Collet
f7755163b7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix paste issue
 2019-04-02 11:05:39 +02:00
Remi Collet
dc1cd3daf2 fix paste issue 2019-04-02 11:05:09 +02:00
Christoph M. Becker
b8fdaa7c42 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Pointer arithmetic on void pointers is illegal
 2019-04-02 10:41:26 +02:00
Christoph M. Becker
f6efe70505 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Pointer arithmetic on void pointers is illegal
 2019-04-02 10:40:56 +02:00
Christoph M. Becker
01a4de5c58 Pointer arithmetic on void pointers is illegal 
We quick-fix this by casting to char*; it might be more appropriate to
use char pointers in the first place.
 2019-04-02 10:39:44 +02:00
Stanislav Malyshev
da5fbb8c36 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
 2019-04-02 00:13:00 -07:00
Stanislav Malyshev
c83af86f8b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
 2019-04-02 00:12:54 -07:00
Stanislav Malyshev
887a7b5714 Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF 2019-04-02 00:12:26 -07:00
Derick Rethans
a22bd7a3a8 Updated to version 2019.1 (2019a) 2019-04-01 10:38:40 +01:00
Stanislav Malyshev
3d5b6f234e Update NEWS & UPGRADING 2019-04-01 00:03:49 -07:00
Stanislav Malyshev
bc8f292c05 Merge branch 'mb-limit-73' into PHP-7.3 
* mb-limit-73:
  Add fallbacks for older oniguruma versions
  Add mbstring.regex_stack_limit to php.ini-*
  Implement RF bug #72777 - ensure stack limits on mbstring functions.
 2019-04-01 00:00:14 -07:00
Stanislav Malyshev
d2a86e1c0f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
 2019-03-31 23:11:27 -07:00
Stanislav Malyshev
682d28abf7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
 2019-03-31 23:11:24 -07:00