clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
109,558 Commits 491 Branches 1,363 Tags 844 MiB
9a9eed472b
Commit Graph

109558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
9a9eed472b Fix second part of bug #77903 
When a HT iterator is one past the end and we rehash, we need to make
sure that it is move to the new one past the end position, to make
sure that newly inserted elements are picked up.
 2019-04-16 10:38:20 +02:00
Nikita Popov
e1b4cabbd6 Partial fix for bug #77903 
In the hash position APIs, make sure we always advance to the next
non-undef element and not just when the position is 0 (similar to
what foreach does). This can happen when the position of an
ArrayIterator is one past its current end and a new element is
inserted not directly at that position because the array is packed.

There is still a bug here (as shown in the tests), but this is a
separate issue that also affects plain array iteration in foreach.
 2019-04-16 10:23:11 +02:00
Nikita Popov
a2f3ec1777 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-15 15:27:30 +02:00
Nikita Popov
619c4e9f2e Fixed bug #77895 2019-04-15 15:26:58 +02:00
Nikita Popov
e05c6a25f9 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-15 15:00:49 +02:00
Nikita Popov
9b1950b005 Zero sockaddr struct 
in6 has a bunch of extra fields that we're leaving uninitialized. I
don't see them locally, but there's valgrind warnings on gcov.
 2019-04-15 14:59:05 +02:00
Nikita Popov
5611058766 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-15 10:54:31 +02:00
Nikita Popov
917952453c Fix uninitialized cert_captured 
This is a legimitimate bug and also shows up under valgrind.
 2019-04-15 10:53:33 +02:00
Nikita Popov
14047b50b4 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-15 10:25:11 +02:00
Nikita Popov
e9c0367fdc Fixed bug #77882 2019-04-15 10:22:40 +02:00
Côme Chilliet
3e1eff251b Updated NEWS 2019-04-15 10:19:19 +02:00
Côme Chilliet
ea0f26420d Fix a NULL dereferencing crash in php-ldap 
This happens when parsing a control response to a VLV request which does
 not contain a "context" string.

See bug #77869
 2019-04-15 10:16:29 +02:00
George Wang
7f551c728c Merge branch 'PHP-7.2' into PHP-7.3 2019-04-12 17:44:32 -04:00
George Wang
1e7f1b90e8 LiteSpeed SAPI 7.3, better process management, new API function litespeed_finish_request(). 2019-04-12 17:43:45 -04:00
Christoph M. Becker
8ed3b74a0c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix tests wrt. internationalization
 2019-04-12 13:08:13 +02:00
Christoph M. Becker
d07a6fdedf Fix tests wrt. internationalization 2019-04-12 13:07:39 +02:00
Nikita Popov
354a1c27aa Merge branch 'PHP-7.2' into PHP-7.3 2019-04-12 10:37:08 +02:00
Nikita Popov
3b53d28e60 Fix key leaks in mb_convert_encoding() 2019-04-12 10:36:58 +02:00
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