summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Prep for 7.2.33Sara Golemon2020-07-071-0/+3
| | |
| | * Prep NEWS for 7.2.32 releasePHP-7.2.32Sara Golemon2020-07-071-1/+4
| | |
* | | Fixed bug #79793Nikita Popov2020-07-073-1/+40
| | | | | | | | | | | | | | | Make sure the string key is not released while throwing the undefined index warning.
* | | Fixed bug #79784Nikita Popov2020-07-073-3/+38
| | | | | | | | | | | | | | | The fix here is essentially the same as for bug #78598, just for the undefined variable notice, rather than the undefined index one.
* | | [ci skip] Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-07-070-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Don't use deprecated curly brace offset syntax
| * | Don't use deprecated curly brace offset syntaxChristoph M. Becker2020-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7ec3aa1871074f5de25865af42c984a7668eb85f) Better safe than sorry in case someone ever builds PHP 7.3 with a future version of PHP SDK with bundled PHP 8.
* | | Don't use deprecated curly brace offset syntaxChristoph M. Becker2020-07-071-2/+2
| | |
* | | Fixed bug #78598Nikita Popov2020-07-075-8/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When performing an RW modification of an array offset, the undefined offset warning may call an error handler / OB callback, which may destroy the array we're supposed to change. Detect this by temporarily incrementing the reference count. If we find that the array has been modified/destroyed in the meantime, we do nothing -- the execution model here would be that the modification has happened on the destroyed version of the array.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-07-073-2/+20
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fixed bug #79792
| * | Fixed bug #79792Nikita Popov2020-07-073-2/+20
| | | | | | | | | | | | | | | | | | We need to remove the iterators even if the array is empty (we will not create one if the first place, but the array may become empty after the fact).
* | | Fixed bug #79779Nikita Popov2020-07-073-15/+26
| | | | | | | | | | | | ASSIGN_OBJ_REF was not handling in zend_wrong_string_offset.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-07-073-1/+36
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fixed bug #79778
| * | Fixed bug #79778Nikita Popov2020-07-073-0/+37
| | | | | | | | | | | | | | | | | | In the interest of avoiding side-effects during dumping, I'm replacing the value with a <constant ast> string instead of performing an update constant operation.
* | | Fixed bug #79783Nikita Popov2020-07-073-1/+17
| | | | | | | | | | | | | | | Make sure we don't drop the by-reference check when passing the result of a VM builtin function.
* | | Fix tests for x86 WindowsChristoph M. Becker2020-07-032-12/+12
| | | | | | | | | | | | | | | `st_dev` deliberately overflows on such systems, cf. <http://svn.php.net/viewvc?view=revision&revision=350100>.
* | | Skip test if SeCreateSymbolicLinkPrivilege is not givenChristoph M. Becker2020-07-031-0/+7
| | |
* | | Enable readlink_realpath_* tests on WindowsChristoph M. Becker2020-07-029-15/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | We modify _basic1.phpt so it runs on Windows as well. The other test cases hit the issue that `readlink()` fails normally for regular files, but succeeds on Windows[1]. Therefore, we split these tests, but still fix the skip reasons. [1] <http://svn.php.net/viewvc?view=revision&revision=350097>
* | | Enable most lstat_stat_* tests on WindowsChristoph M. Becker2020-07-0217-115/+61
| | | | | | | | | | | | | | | | | | | | | | | | Most of these have been skipped on Windows for no good reason (`lstat` is available there as of PHP 4). Several others would only fail, because the `blksize` and `blocks` elements are always `-1` on Windows, which can easily be fixed by using `%i` format specifiers instead of `%d`.
* | | Update php_version.hChristoph M. Becker2020-07-021-3/+3
| | | | | | | | | | | | That has apparently been overlooked.
* | | Extract test helper function for SeCreateSymbolicLinkPrivilege checkChristoph M. Becker2020-07-026-34/+16
| | |
* | | Handle SO_ options only at SOL_SOCKET levelNikita Popov2020-07-021-40/+41
| | | | | | | | | | | | | | | | | | These options may have the same value as options at other levels. This issue showed up on ppc64el.
* | | Allow different error message for errno 58Nikita Popov2020-07-021-1/+1
| | | | | | | | | | | | Apparently this is EDEADLOCK on some systems.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-06-301-4/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Remove bogus generator iterator dtor
| * | Remove bogus generator iterator dtorNikita Popov2020-06-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a use-after-free encountered in Symfony's SecurityBundle. I don't have a reproducer for this, and believe the issue can only occur if we leak an iterator (the leak is a separate issue). We should not free the generator iterator here, because we do not own it. The code that fetched the iterator is responsible for releasing it. In the rare case where we do hit this code-path, we cause a use-after-free.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-06-302-1/+27
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix leak when setting cyclic previous exception in finally
| * | Fix leak when setting cyclic previous exception in finallyNikita Popov2020-06-302-1/+27
| | | | | | | | | | | | A curious exception handling pattern found in Symfony's HttpClient.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-303-1/+19
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #70362: Can't copy() large 'data://' with open_basedir
| * | Fix #70362: Can't copy() large 'data://' with open_basedirChristoph M. Becker2020-06-303-1/+19
| | | | | | | | | | | | | | | open_basedir is only relevant for plain files, so there is no need to check it for other URL wrappers.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-295-14/+80
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #63208: BSTR to PHP string conversion not binary safe
| * | Fix #63208: BSTR to PHP string conversion not binary safeChristoph M. Becker2020-06-295-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A `BSTR` is similar to a `zend_string`; it stores the length of the string just before the actual string, and thus the string may contain NUL bytes. However, `php_com_olestring_to_string()` is supposed to deal with arbitrary `OLECHAR*`s which may not be `BSTR`s, so we introduce `php_com_bstr_to_string()` and use it for the only case where we actually have to deal with `BSTR`s which may contain NUL bytes. Contrary to `php_com_olestring_to_string()` we return a `zend_string`, so we can save the re-allocation when converting to a `zval`. We also cater to `php_com_string_to_olestring()` not being binary safe, with basically the same fix we did for `php_com_olestring_to_string()`.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-294-4/+29
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #79756: finfo_file crash (FILEINFO_MIME)
| * | Fix #79756: finfo_file crash (FILEINFO_MIME)Christoph M. Becker2020-06-294-4/+29
| | | | | | | | | | | | | | | If `ctime` or `asctime` return `NULL`, we must not attempt to copy the buffer, but rather return `NULL` as well.
* | | Don't inline static call to instance methodNikita Popov2020-06-291-0/+6
| | | | | | | | | | | | Fixes the failure in bug79740.phpt with opcache.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-06-262-2/+18
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fixed bug #79741
| * | Fixed bug #79741Nikita Popov2020-06-263-2/+22
| | |
* | | Fixed bug #79740Nikita Popov2020-06-263-0/+32
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-06-242-1/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fixed bug #79030 Use usec from apache request time
| * | Fixed bug #79030 Use usec from apache request timeHerbert2562020-06-242-1/+5
| | | | | | | | | | | | | | | | | | Don't unnecessarily truncate to milliseconds. Closes GH-5760.
* | | Handle *0 / *1 more consistentlyNikita Popov2020-06-241-2/+5
| | | | | | | | | | | | | | | Avoid throwing a DES salt deprecation warning if the libc crypt implementation is used.
* | | Fix potential environment variable deadlockChristoph M. Becker2020-06-241-0/+1
| | | | | | | | | | | | We have to unlock the environment before bailing out.
* | | Fix #69804: ::getStaticPropertyValue() throws on protected propsChristoph M. Becker2020-06-245-37/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ReflectionClass` allows reading of the values of private and protected constants, and also to get private and protected static methods. Therefore getting the values of private and protected static properties is also permissible, especially since `::getStaticProperties()` already allows to do so. We also allow ::setStaticPropertyValue() to modify private and protected properties, because otherwise this method is useless, as modifying public properties can be done directly.
* | | Fix #79487: ::getStaticProperties() ignores property modificationsChristoph M. Becker2020-06-243-4/+69
| | | | | | | | | | | | | | | When retrieving the static class properties via reflection, we have to cater to possible modifications.
* | | Revert "Fix #79487: ::getStaticProperties() ignores property modifications"Christoph M. Becker2020-06-233-69/+4
| | | | | | | | | | | | This reverts commit a895bb6885fbceea3e8375816969d5510d8d082e.
* | | Fix #79487: ::getStaticProperties() ignores property modificationsChristoph M. Becker2020-06-233-4/+69
| | | | | | | | | | | | | | | When retrieving the static class properties via reflection, we have to cater to possible modifications.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-232-1/+9
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #55857: ftp_size on large files
| * | Fix #55857: ftp_size on large filesChristoph M. Becker2020-06-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | `atol()` returns a `long` which is not the same as `zend_long` on LLP64; we use `ZEND_ATOL()` instead. There is no need for a new test case, since filesize_large.phpt already tests for that behavior; unfortunately, the FTP test suite relies on `pcntl_fork()` and therefore cannot be run on Windows.
* | | Restore XFAIL on fpm testNikita Popov2020-06-231-0/+2
| | | | | | | | | | | | Still fails intermittently.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-230-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: 7.3 is now 7.3.21-dev
| * | 7.3 is now 7.3.21-devChristoph M. Becker2020-06-234-5/+7
| | |
* | | PHP-7.4 is now 7.4.9-devDerick Rethans2020-06-231-1/+1
| | |