summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_webdata_transfer.c
Commit message (Collapse)AuthorAgeFilesLines
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-8/+8
|
* Merge remote-tracking branch 'origin/PHP-5.6'Bob Weinand2014-10-281-7/+12
|\ | | | | | | | | | | Conflicts: sapi/phpdbg/phpdbg_wait.c sapi/phpdbg/phpdbg_webdata_transfer.c
| * Merge phpdbg into PHP-5.6Bob Weinand2014-10-281-0/+2
| |
| * Merge ../phpdbg into PHP-5.6Bob Weinand2014-10-281-7/+13
| | | | | | | | | | Conflicts: sapi/phpdbg/config.m4
* | Made phpdbg compatible with new engineBob Weinand2014-10-241-76/+61
|/
* Merge phpdbg into PHP-5.6Bob Weinand2014-10-241-0/+185