Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Christopher Jones | 2019-02-11 | 8 | -13/+381 | |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | * PHP-7.2: PDO_OCI tracing attribute PR merge pdo_oci: Add client identifier and module attrs pdo_oci: Register new attr constants and add tests pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO | |||||
| * | | PDO_OCI tracing attribute PR merge | Christopher Jones | 2019-02-11 | 1 | -0/+4 | |
| | | | ||||||
| * | | pdo_oci: Add client identifier and module attrs | Cameron Porter | 2019-02-11 | 8 | -45/+206 | |
| | | | | | | | | | | | | | | | Add tests for the new attributes, and check the setAttribute return value. | |||||
| * | | pdo_oci: Register new attr constants and add tests | Cameron Porter | 2019-02-11 | 4 | -0/+169 | |
| | | | ||||||
| * | | pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO | Cameron Porter | 2019-02-11 | 2 | -0/+38 | |
| | | | | | | | | | | | | | | | Add the ability to set the action and client info on the database session for PDO OCI using PDO attributes. | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-02-08 | 1 | -1/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Fix FTPS passive mode of data channel event poll | YanTao | 2019-02-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | Bugfix: when using passive mode of FTPS protocol, data channel events should be polled when creating data connection channel, instead of polling the event of ftp's self control channel, which may cause ftp transfer problem while using ftps and passive mode. | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Anatol Belski | 2019-02-07 | 2 | -4/+4 | |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-7.2: Sync test with changes in libcurl 7.64.0 Sync test for libcurl 7.64.0 | |||||
| * | | Sync test with changes in libcurl 7.64.0 | Anatol Belski | 2019-02-07 | 1 | -3/+3 | |
| | | | ||||||
| * | | Sync test for libcurl 7.64.0 | Anatol Belski | 2019-02-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Derick Rethans | 2019-02-07 | 1 | -37/+71 | |
|\ \ \ | |/ / | ||||||
| * | | Use pkg-config for ICU, as the old icu-config has been deprecated | Derick Rethans | 2019-02-07 | 1 | -32/+66 | |
| | | | ||||||
* | | | Fix NEWS | Christoph M. Becker | 2019-02-05 | 1 | -4/+2 | |
| | | | | | | | | | | | | Bug #77287 is already fixed in PHP 7.3.2. | |||||
* | | | [ci skip] Add missing notes regarding gc_status() | Christoph M. Becker | 2019-02-03 | 2 | -0/+3 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Joe Watkins | 2019-02-03 | 1 | -2/+2 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Properly check for array_replace_recursive in sccp.c | |||||
| * | | Properly check for array_replace_recursive in sccp.c | Tyson Andre | 2019-02-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | Due to a typo, this code used to check for array_merge_recursive twice. | |||||
* | | | Fixed bug #77329 (Buffer Overflow via overly long Error Messages) | Dmitry Stogov | 2019-02-01 | 2 | -1/+8 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Joe Watkins | 2019-01-30 | 2 | -2/+5 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix bug 76596: phpdbg supports display_errors=stderr | |||||
| * | | Fix bug 76596: phpdbg supports display_errors=stderr | Kevin Abel | 2019-01-30 | 2 | -2/+5 | |
| | | | ||||||
* | | | Fix #77546 iptcembed broken function | Guillaume Degoulet | 2019-01-30 | 3 | -1/+112 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Christoph M. Becker | 2019-01-30 | 0 | -0/+0 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Prepare main branch for PHP 7.2.16 | |||||
| * | | Prepare main branch for PHP 7.2.16 | Christoph M. Becker | 2019-01-30 | 3 | -5/+7 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-01-29 | 1 | -8/+10 | |
|\ \ \ | |/ / | ||||||
| * | | Make special assert() handling independent of compiler flags | Nikita Popov | 2019-01-29 | 1 | -8/+10 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-01-28 | 3 | -1/+19 | |
|\ \ \ | |/ / | ||||||
| * | | Fixed bug #77530: PHP crashes when parsing "(2)::class" | ekinhbayar | 2019-01-28 | 3 | -1/+19 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Jakub Zelenka | 2019-01-25 | 4 | -49/+188 | |
|\ \ \ | |/ / | ||||||
| * | | Fix bug #77390 (feof might hang on TLS streams in case of fragmented TLS ↵ | Jakub Zelenka | 2019-01-25 | 3 | -24/+25 | |
| | | | | | | | | | | | | | | | | | | records) Simplified version of the fix from Abyl Valg so credit to him. | |||||
| * | | Update and integrate openssl client proxy test | Jakub Zelenka | 2019-01-25 | 3 | -150/+72 | |
| | | | ||||||
| * | | Add a test for fragmented SSL packets | Abyr Valg | 2019-01-25 | 2 | -0/+216 | |
| | | | ||||||
* | | | Fixed bug #77498 | Nikita Popov | 2019-01-25 | 5 | -3/+27 | |
| | | | | | | | | | | | | | | | I've renamed the function to the same name as the exported symbol in master. | |||||
* | | | Fixed bug #77514 | Nikita Popov | 2019-01-24 | 3 | -3/+18 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-01-24 | 0 | -0/+0 | |
|\ \ \ | |/ / | ||||||
| * | | Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2 | Nikita Popov | 2019-01-24 | 3 | -0/+29 | |
| |\ \ | ||||||
* | \ \ | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-01-24 | 1 | -25/+25 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Revert "Prefix error_code with underscore in FastZPP implementation" | Nikita Popov | 2019-01-24 | 1 | -25/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6305119a5193d4318add01190ca4afbb49ded102. This is a source-compatibility break for extensions that define custom FastZPP macros, such as ext/uv: https://github.com/bwoebi/php-uv/blob/a983eb17b69f74a45d785ddc6a7bff3d4531b88c/php_uv.c#L75 I don't think that FastZPP was intended to be used this way, but let's revert this from release branches to avoid extension breakage. | |||||
* | | | | Merge branch 'PHP-7.2' into PHP-7.3 | Dmitry Stogov | 2019-01-24 | 3 | -0/+30 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | * PHP-7.2: Fixed bug #77494 (Disabling class causes segfault on member access) | |||||
| * | | | Fixed bug #77494 (Disabling class causes segfault on member access) | Dmitry Stogov | 2019-01-24 | 3 | -0/+29 | |
| |/ / | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-01-24 | 2 | -0/+7 | |
|\ \ \ | |/ / | ||||||
| * | | Add flag to disable jumptable optimization | Nikita Popov | 2019-01-24 | 2 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | This is useful for coverage. While it is currently safe to just skip over the SWITCH_* opcodes, this may not be true in the future due to opcache optimizations, so it's safer to disable emission of SWITCH_* opcodes entirely. | |||||
* | | | Prepare main branch for PHP 7.3.3 | Christoph M. Becker | 2019-01-22 | 4 | -8/+12 | |
| | | | ||||||
* | | | Fixed bug #77287 | Nikita Popov | 2019-01-22 | 2 | -1/+3 | |
| | | | | | | | | | | | | | | | There may be an EXT_NOP opcode before the parameter list, we should skip over it. | |||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | George Wang | 2019-01-20 | 4 | -47/+84 | |
|\ \ \ | |/ / | ||||||
| * | | Checkin LiteSpeed SAPI 7.2. | George Wang | 2019-01-20 | 4 | -47/+84 | |
| | | | ||||||
* | | | Update NEWS [ci skip] | Anatol Belski | 2019-01-20 | 1 | -0/+6 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Anatol Belski | 2019-01-20 | 0 | -0/+0 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Update NEWS [ci skip] | |||||
| * | | Update NEWS [ci skip] | Anatol Belski | 2019-01-20 | 1 | -0/+4 | |
| | | | ||||||
* | | | Skip test on unsuitable build | Anatol Belski | 2019-01-19 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This test reveals a difference between TS and NTS through all the versions, which is probably too late to fix at this stage of 7.3. While NTS always relies on the system getcwd(), TS uses a fake CWD which might get out of sync when the real dir is deleted. Thus, skip test on unsuitable build. Investigate possibilities to fix this edge case for later versions. | |||||
* | | | Fix failing test | Christoph M. Becker | 2019-01-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'PHP-7.2' into PHP-7.3 | Christoph M. Becker | 2019-01-19 | 3 | -0/+28 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.2: Fix #77479: imagewbmp() segfaults with very large images |