summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Update versions for PHP 8.0.0RC2php-8.0.0RC2Sara Golemon2020-10-131-2/+2
|
* Expose php_during_module_startup() and php_during_module_shutdown()Sammy Kaye Powers2020-10-052-2/+4
| | | | | | This can be handy when trying to determine if it is safe to access request globals amongst other things. Closes GH-6265
* Prepare for PHP 8.0 RC1Gabriel Caruso2020-09-301-1/+1
|
* Fix #78792: zlib.output_compression disabled by Content-Type: image/Christoph M. Becker2020-09-291-7/+0
| | | | | | | | | | | | Disabling output compression for images has served to fix bug #16109, where zlib compressed images apparently have caused issues with Navigator 4. This shouldn't be an issue with somewhat contemporary browsers. Other than that, this is an arbitrary restriction – why don't we disable the compression for some other media types as well (e.g. video/* and audio/*)? All in all, we should leave that decision to userland. Closes GH-6198.
* Merge branch 'PHP-7.4'Stanislav Malyshev2020-09-281-1/+3
|\ | | | | | | | | | | | | | | | | * PHP-7.4: Update UPGRADING Update UPGRADING Update NEWS & UPGRADING Do not decode cookie names anymore Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
| * Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2020-09-281-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-7.3: Update UPGRADING Update NEWS & UPGRADING Do not decode cookie names anymore Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
| | * Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2020-09-281-2/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.2: Update NEWS & UPGRADING Do not decode cookie names anymore Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
| | | * Do not decode cookie names anymoreStanislav Malyshev2020-09-261-2/+6
| | | |
| | | * bump version to 7.2.34-devRemi Collet2020-08-041-3/+3
| | | |
| | | * bump version to 7.2.32-devRemi Collet2020-05-121-3/+3
| | | |
* | | | Clear error flag instead of toggling itChristoph M. Becker2020-09-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The toggling of the `REPORT_ERRORS` looks fishy, and likely was intented as clearing. Closes GH-6190.
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-231-3/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fix #76735: Incorrect message in fopen on invalid mode
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-231-3/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.3: Fix #76735: Incorrect message in fopen on invalid mode
| | * | Fix #76735: Incorrect message in fopen on invalid modeChristoph M. Becker2020-09-231-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to log errors in `stream_opener` callbacks to the wrapper's error log, because otherwise we may pick up an unrelated `errno` or a most generic message. Closes GH-6187.
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-221-6/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fix #76943: Inconsistent stream_wrapper_restore() errors
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-221-6/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.3: Fix #76943: Inconsistent stream_wrapper_restore() errors
| | * | Fix #76943: Inconsistent stream_wrapper_restore() errorsChristoph M. Becker2020-09-221-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If restoring of any not registered built-in wrapper is requested, the function is supposed to fail with a warning, so we have to check this condition first. Furthermore, to be able to detect whether a built-in wrapper has been changed, it is not sufficient to check whether *any* userland wrapper has been registered, but rather whether the specific wrapper has been modified. Closes GH-6183.
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-221-1/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fix #79423: copy command is limited to size of file it can copy
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-221-1/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.3: Fix #79423: copy command is limited to size of file it can copy
| | * | Fix #79423: copy command is limited to size of file it can copyChristoph M. Becker2020-09-221-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing `NULL` as `lpFileSizeHigh` to `GetFileSize()` gives wrong results for files larger than 0xFFFFFFFF bytes. We fix this by using `GetFileSizeEx()`, and let the mapping fail, if the file size is too large for the architecture. Closes GH-5319.
| | * | 7.3.24 is nextChristoph M. Becker2020-09-151-3/+3
| | | |
* | | | Check linker compatibility directly from HMODULEChristoph M. Becker2020-09-212-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking the linker compatibility with extranous `ImageLoad()` calls is possible, but unnecessary, since the modules are either already loaded or loaded shortly afterwards, so that we can get the required information directly from the module handles. And actually, doing `ImageLoad()` as well as `LoadLibrary()` leaves a tiny room for a race condition, because both functions will lookup the module in the search path, so there is no *guarantee* that both are dealing with the same module. Dropping the `ImageLoad()` calls also has the advantage to no longer face the issue reported in bug #79557. A very minor additional advantage is that we no longer have to link against Imagehlp.dll. Furthermore, there is no need to check for CRT compatibility multiple times, so we can simplify the signature of `php_win32_crt_compatible`, and at the same time clean up main.c a bit. These changes require to change the signature of the exported `php_win32_image_compatible` and `php_win32_crt_compatible` functions, which now expect a `HMODULE` and nothing, respectively, instead of the module name.
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-213-17/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fix mmap copying
| * | | Fix mmap copyingChristoph M. Becker2020-09-213-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of attempting to map large files into memory at once, we map chunks of at most `PHP_STREAM_MMAP_MAX` bytes, and repeat that until we hit the point where `php_stream_seek()` fails (see bug 54902), and copy the rest of the file by reading and writing small chunks. We also fix the mapping behavior for zero bytes on Windows, which did not error (as with `mmap()`), but would have mapped the remaining file.
* | | | Add system ID entropy APISammy Kaye Powers2020-09-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | The `zend_system_id` is a (true global) system ID that fingerprints a process state. When extensions add engine hooks during MINIT/startup, entropy is added the system ID for each hook. This allows extensions to identify that changes have been made to the engine since the last PHP process restart. Closes GH-5871
* | | | Change int parameter types to bool when the parameter behaves as boolMáté Kocsis2020-09-171-2/+2
| | | | | | | | | | | | | | | | Closes GH-6148
* | | | Fix observer leakNikita Popov2020-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | Make sure to startup observer infrastructure before we register the first observer...
* | | | Rename zend_error_notify APIs to zend_observer_error*Benjamin Eberlei2020-09-141-1/+1
| | | |
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-112-4/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fix #80067: Omitting the port in bindto setting errors
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-112-4/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.3: Fix #80067: Omitting the port in bindto setting errors
| | * | Fix #80067: Omitting the port in bindto setting errorsChristoph M. Becker2020-09-112-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent commit[1] which fixed a memory leak introduced a regression regarding the formerly liberal handling of IP addresses to bind to. We fix this by reverting that commit, and fix the memory leak where it actually occurs. In other words, this fix is less intrusive than the former fix. [1] <http://git.php.net/?p=php-src.git;a=commit;h=0b8c83f5936581942715d14883cdebddc18bad30> Closes GH-6104.
* | | | Simplify error type filtertwosee2020-09-101-19/+11
| | | | | | | | | | | | | | | | Closes GH-6049.
* | | | Add "const". Move constant strings to read-only memory.Dmitry Stogov2020-09-072-2/+2
| | | |
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-031-8/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Fix #80048: Bug #69100 has not been fixed for Windows
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-031-8/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.3: Fix #80048: Bug #69100 has not been fixed for Windows
| | * | Fix #80048: Bug #69100 has not been fixed for WindowsChristoph M. Becker2020-09-031-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | We fix the erroneous length calculation on Windows, too. Closes GH-6067.
| | * | 7.3.23 is nextChristoph M. Becker2020-08-181-3/+3
| | | |
| * | | Prepare for 7.4.11Derick Rethans2020-08-181-3/+3
| | | |
| * | | Use standard types in fopencookie testNikita Popov2020-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of internal __size_t / __off64_t types use ssize_t and off64_t. This makes it work on musl as well.
* | | | Add zend_observer APILevi Morrison2020-09-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes GH-5857. Co-authored-by: Nikita Popov <nikita.ppv@gmail.com> Co-authored-by: Sammy Powers <sammyk@datadoghq.com>
* | | | Rehash function table after disabling functionsNikita Popov2020-08-282-42/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To perform fast shutdown without full table cleanup we need all internal functions to be in one continuous chunk. This was violated when functions were deleted via disable_functions. This drops the zend_disable_function() API in favor of zend_disable_functions(), which disables the given list of functions and performs the necessary rehash afterwards. Also drop PG(disabled_functions), which is no longer used.
* | | | Improve type declarations for Zend APIsGeorge Peter Banyard2020-08-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Voidification of Zend API which always succeeded Use bool argument types instead of int for boolean arguments Use bool return type for functions which return true/false (1/0) Use zend_result return type for functions which return SUCCESS/FAILURE as they don't follow normal boolean semantics Closes GH-6002
* | | | Drop various unused macros/APIsGeorge Peter Banyard2020-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Also convert_libmagic_pattern() to return a zend_string* Closes GH-6029
* | | | Disable report_zend_debug by defaultNikita Popov2020-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We might just want to drop this completely, but at least don't enable it by default. It already gets disabled by a number of SAPIs, but we should make that the default state.
* | | | Fixed bug #65275Nikita Popov2020-08-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Make EG(exit_status) the single source of truth for the exit status, instead of having two variables that we cannot really keep synchronized.
* | | | Fixed bug #77561Nikita Popov2020-08-101-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unconditionally strip shebang lines when using the CLI SAPI, independently of whether they occur in the primary or non-primary script. It's unlikely that someone intentionally wants to print that shebang line when including a script, and this regularly causes issues when scripts are used in multiple contexts, e.g. for direct invocation and as a phar bootstrap.
* | | | Add more argument types to stubsMáté Kocsis2020-08-071-7/+4
| | | | | | | | | | | | | | | | Closes GH-5943
* | | | Prefer strtoll over atollNikita Popov2020-08-051-9/+0
| | | | | | | | | | | | | | | | | | | | Both are specified by C99, but strtoll has specified overflow behavior while atoll does not, so prefer using it.
* | | | Only force log startup errors if display_startup_errors disabledNikita Popov2020-08-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise this results in duplicate errors. Closes GH-5941.
* | | | Use standard types in fopencookie testNikita Popov2020-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of internal __size_t / __off64_t types use ssize_t and off64_t. This makes it work on musl as well.
View Lorry Controller Status