summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update NEWSPHP-7.4.2Derick Rethans2020-01-211-0/+7
|
* Update NEWS for PHP 7.4.2Derick Rethans2020-01-211-1/+1
|
* Remove RC1 headerDerick Rethans2020-01-211-4/+0
|
* Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2020-01-216-5/+115
| | | | | | | | * PHP-7.3: Update NEWS Fix bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`) Fix #79099: OOB read in php_strip_tags_ex Fix #79091: heap use-after-free in session_create_id()
* Fixed release line in NEWSDerick Rethans2020-01-071-1/+1
|
* Update NEWS for 7.4.3Derick Rethans2020-01-071-0/+3
|
* Update NEWS for PHP 7.4.2RC1Derick Rethans2020-01-071-1/+1
|
* Remove support for preloading on WindowsNikita Popov2020-01-0637-141/+147
| | | | | | | | | | | | | Due to ASLR restrictions, preloading on Windows does not work with any code that has preloading dependencies on internal classes. This effectively makes it unusable for any non-trivial codebase. Instead of pretending like preloading is going to work, only to make people realize that it really doesn't once they get beyond a dummy example, we disable support for preloading on Windows entirely. Closes GH-4999.
* Throw Error when referencing uninit typed prop in __sleepNikita Popov2020-01-063-9/+101
| | | | | | | | | | | | | Previously this generated a notice, but would likely generate an Error when unserializing. Now we treat it with the same distinction as direct property accesses, i.e. referencing an unset/undefined normal property stays a notice, while a typed property becomes an Error exception. This fixed bug #79002. Closes GH-5050.
* [ci skip] Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-01-060-0/+0
|\ | | | | | | Empty merge.
| * Revert "Extend CURLFile to support streams"Christoph M. Becker2020-01-066-147/+1
| | | | | | | | | | | | This reverts commit 17a9f1401aeb35fe1e3657b38102a410d151d42f, because this commit would break ABI, and also due to bug #79013. We keep the commit for PHP 7.4+, though.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-01-063-1/+27
|\ \ | |/ | | | | | | * PHP-7.3: Fix #54298: Using empty additional_headers adding extraneous CRLF
| * Fix #54298: Using empty additional_headers adding extraneous CRLFChristoph M. Becker2020-01-063-1/+29
| | | | | | | | | | If the header string is empty, we pass `NULL` to `php_mail()` to avoid further checks on the string length.
* | Don't link against openssl 1.1 in curlNikita Popov2020-01-062-5/+15
| | | | | | | | | | OpenSSL 1.1 does not need crypto locking callbacks, so avoid detecting and linking against it in the first place.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-01-064-1/+24
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79068: gdTransformAffineCopy() changes interpolation method
| * Fix #79068: gdTransformAffineCopy() changes interpolation methodChristoph M. Becker2020-01-064-1/+24
| | | | | | | | | | We port <https://github.com/libgd/libgd/commit/9088591eae437358ee5b929adf82865e37e3001e>.
* | Fix bug #79063: Curl openssl does not respect PKG_CONFIG_PATHNikita Popov2020-01-062-4/+6
| |
* | Clean up curl openssl checkNikita Popov2020-01-063-14/+6
| | | | | | | | | | | | Only set HAVE_CURL_OPENSSL flag, and remove Windows specific code, as all of this is only relevant for OpenSSL < 1.1, which is not used on Windows.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-01-064-3/+23
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79067: gdTransformAffineCopy() may use unitialized values
| * Fix #79067: gdTransformAffineCopy() may use unitialized valuesChristoph M. Becker2020-01-064-3/+21
| | | | | | | | | | We port <https://github.com/libgd/libgd/commit/7a06c1669c563917bc48c464521e3de962ddb4e8>.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-01-034-0/+51
|\ \ | |/ | | | | | | * PHP-7.3: Fix #78808: [LMDB] MDB_MAP_FULL: Environment mapsize limit reached
| * Fix #78808: [LMDB] MDB_MAP_FULL: Environment mapsize limit reachedChristoph M. Becker2020-01-034-0/+51
| | | | | | | | | | | | | | We implement support for a fifth parameter, which allows to specify the mapsize. The parameter defaults to zero, in which case the compiled in default mapsize (usually 1048576) will be used. The mapsize should be a multiple of the page size of the OS.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-01-032-1/+10
|\ \ | |/ | | | | | | * PHP-7.3: Fix #78538: shmop memory leak
| * Fix #78538: shmop memory leakChristoph M. Becker2020-01-032-1/+10
| | | | | | | | | | If the descriptor's refcount drops to zero, we have to unmap the respective file view, to avoid leaking memory.
* | Slightly increase tolerance in time_sleep_until() testNikita Popov2020-01-031-1/+1
| | | | | | | | | | With the 1ms tolerance this still occasionally fails on macos. I love macos. It always works and causes no problems at all.
* | Try to fix intermittently failing test caseChristoph M. Becker2020-01-031-1/+1
| | | | | | | | | | | | This test fails intermittently due to taskill reporting failure to kill the process (because it already has been terminated). We increase the sleep time, to hopefully prevent that from happening again.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-01-033-5/+52
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79015: undefined-behavior in php_date.c
| * Fix #79015: undefined-behavior in php_date.cChristoph M. Becker2020-01-033-5/+52
| | | | | | | | | | | | We check that the given microsecond fraction is in the valid range [0, 1000000[, and otherwise mark it as invalid. We also drop the useless do loop; a plain block is sufficient here.
* | Remove unnecessary strncpy in zipNikita Popov2020-01-031-3/+2
| | | | | | | | | | | | This causes a warning on GCC 9 and is unnecessary to boot: We only use "cwd" for the open_basedir check, so we can just as well pass in the original string.
* | Add test for bug #73816Nikita Popov2020-01-031-0/+24
| | | | | | | | | | This has been fixed by 0f2cdbf214efd98b4bdaf5ca41728faf00e7c037, add the test case.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-01-030-0/+0
|\ \ | | | | | | | | | | | | * PHP-7.3: Fixed bug #71876
| * | Fixed bug #71876Nikita Popov2020-01-032-4/+6
| |/ | | | | | | | | | | | | This is a backport of fcdc0a6db0ae63fbed9e3828137b899b844623ce to the PHP-7.3 branch. We need to make sure that OnUpdateString is also called for a NULL value, otherwise the reset of the encoding at the end of the request will not work.
* | Fixed bug #79056Nikita Popov2020-01-033-21/+16
| |
* | Add test case for bug #78883Christoph M. Becker2020-01-021-0/+34
| | | | | | | | The original test has been provided by divinity76.
* | Fixed bug #79055Nikita Popov2020-01-022-37/+31
| | | | | | | | | | | | | | | | | | Fix file cache serialization of property types. I'm changing the overall type serialization format to perform additional adjustments in order to yield a plausible pointer for zend_type, rather than using an entirely separate serialization format, as was previously done. That would have been annoying to extend to the case of CE pointers.
* | Extract functions for file cache type serializationNikita Popov2020-01-021-17/+29
| | | | | | | | This is already done in master.
* | Fix file cache run_time_cache unserializationNikita Popov2020-01-021-1/+9
| | | | | | | | | | | | If the script was serialized as file_cache_only (thus non-immutable) and then gets unserialized into SHM, we need to allocate a new run_time_cache slot and can't use the serialized arena pointer.
* | Update ZCSG(map_ptr_last) only if for_shmNikita Popov2020-01-021-1/+3
| | | | | | | | | | Otherwise we may get a memory protection fault here. Updating of ZCSG(map_ptr_last) is handled when loading from file cache to SHM.
* | Populate hashtable of __sleep() propertiesNikita Popov2020-01-022-82/+76
| | | | | | | | | | | | | | | | | | Instead of populating a hashtable of property names and then directly serializing. This has the advantage of a) detecting duplicate properties more precisely and b) gives us the ability to discard values without rewriting the serialization string after the fact for GH-5027.
* | Deref names returned by __sleep()Nikita Popov2020-01-022-0/+19
| |
* | Extract php_var_serialize_nested_data() functionNikita Popov2020-01-021-61/+61
| | | | | | | | And split code-paths for arrays and objects based on it.
* | [ci skip] Revert "Add test case for bug #78883"Christoph M. Becker2019-12-311-33/+0
| | | | | | | | | | This reverts commit 09e76cbe6d73399f3476942e7502de0bdbf65fa2, because the test fails reliably on AppVeyor. This needs closer investigation.
* | Add test case for bug #78883Christoph M. Becker2019-12-311-0/+33
| | | | | | | | The actual test has been provided by divinity76.
* | Remove superfluous compiler optionChristoph M. Becker2019-12-311-1/+0
| | | | | | | | | | `-fsanitize-address-use-after-scope` is the default as of clang 5.0.0, and we don't allow to enable ASan for older versions anyway.
* | Also propagate include exceptions in opcacheNikita Popov2019-12-301-20/+28
| |
* | Make url_stats in resolve_path quietNikita Popov2019-12-302-2/+32
| | | | | | | | | | | | These stats are used to check whether the file exists -- they should not generate errors. Having the flag set is particularly important for custom stream wrappers.
* | Avoid undefined behaviorChristoph M. Becker2019-12-301-1/+1
| |
* | Properly propagate url_stat exceptions during includeNikita Popov2019-12-307-10/+60
| | | | | | | | | | Make sure we abort operations early, and that we don't emit additional warnings or errors if an exception has been thrown.
* | Fixed bug #79046Nikita Popov2019-12-303-2/+38
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-12-302-4/+6
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79040: Warning Opcode handlers are unusable due to ASLR