summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'PHP-7.2' into PHP-7.3Christopher Jones2019-02-118-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 mergeChristopher Jones2019-02-111-0/+4
| | |
| * | pdo_oci: Add client identifier and module attrsCameron Porter2019-02-118-45/+206
| | | | | | | | | | | | | | | Add tests for the new attributes, and check the setAttribute return value.
| * | pdo_oci: Register new attr constants and add testsCameron Porter2019-02-114-0/+169
| | |
| * | pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFOCameron Porter2019-02-112-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.3Nikita Popov2019-02-081-1/+1
|\ \ \ | |/ /
| * | Fix FTPS passive mode of data channel event pollYanTao2019-02-081-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.3Anatol Belski2019-02-072-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.0Anatol Belski2019-02-071-3/+3
| | |
| * | Sync test for libcurl 7.64.0Anatol Belski2019-02-071-1/+1
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Derick Rethans2019-02-071-37/+71
|\ \ \ | |/ /
| * | Use pkg-config for ICU, as the old icu-config has been deprecatedDerick Rethans2019-02-071-32/+66
| | |
* | | Fix NEWSChristoph M. Becker2019-02-051-4/+2
| | | | | | | | | | | | Bug #77287 is already fixed in PHP 7.3.2.
* | | [ci skip] Add missing notes regarding gc_status()Christoph M. Becker2019-02-032-0/+3
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-02-031-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Properly check for array_replace_recursive in sccp.c
| * | Properly check for array_replace_recursive in sccp.cTyson Andre2019-02-031-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 Stogov2019-02-012-1/+8
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-01-302-2/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix bug 76596: phpdbg supports display_errors=stderr
| * | Fix bug 76596: phpdbg supports display_errors=stderrKevin Abel2019-01-302-2/+5
| | |
* | | Fix #77546 iptcembed broken functionGuillaume Degoulet2019-01-303-1/+112
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-01-300-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Prepare main branch for PHP 7.2.16
| * | Prepare main branch for PHP 7.2.16Christoph M. Becker2019-01-303-5/+7
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-01-291-8/+10
|\ \ \ | |/ /
| * | Make special assert() handling independent of compiler flagsNikita Popov2019-01-291-8/+10
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-01-283-1/+19
|\ \ \ | |/ /
| * | Fixed bug #77530: PHP crashes when parsing "(2)::class"ekinhbayar2019-01-283-1/+19
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-01-254-49/+188
|\ \ \ | |/ /
| * | Fix bug #77390 (feof might hang on TLS streams in case of fragmented TLS ↵Jakub Zelenka2019-01-253-24/+25
| | | | | | | | | | | | | | | | | | records) Simplified version of the fix from Abyl Valg so credit to him.
| * | Update and integrate openssl client proxy testJakub Zelenka2019-01-253-150/+72
| | |
| * | Add a test for fragmented SSL packetsAbyr Valg2019-01-252-0/+216
| | |
* | | Fixed bug #77498Nikita Popov2019-01-255-3/+27
| | | | | | | | | | | | | | | I've renamed the function to the same name as the exported symbol in master.
* | | Fixed bug #77514Nikita Popov2019-01-243-3/+18
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-01-240-0/+0
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2Nikita Popov2019-01-243-0/+29
| |\ \
* | \ \ Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-01-241-25/+25
|\ \ \ \ | |/ / /
| * | | Revert "Prefix error_code with underscore in FastZPP implementation"Nikita Popov2019-01-241-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.3Dmitry Stogov2019-01-243-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 Stogov2019-01-243-0/+29
| |/ /
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-01-242-0/+7
|\ \ \ | |/ /
| * | Add flag to disable jumptable optimizationNikita Popov2019-01-242-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.3Christoph M. Becker2019-01-224-8/+12
| | |
* | | Fixed bug #77287Nikita Popov2019-01-222-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.3George Wang2019-01-204-47/+84
|\ \ \ | |/ /
| * | Checkin LiteSpeed SAPI 7.2.George Wang2019-01-204-47/+84
| | |
* | | Update NEWS [ci skip]Anatol Belski2019-01-201-0/+6
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Anatol Belski2019-01-200-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Update NEWS [ci skip]
| * | Update NEWS [ci skip]Anatol Belski2019-01-201-0/+4
| | |
* | | Skip test on unsuitable buildAnatol Belski2019-01-191-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 testChristoph M. Becker2019-01-191-1/+1
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-01-193-0/+28
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #77479: imagewbmp() segfaults with very large images