summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-06-301-4/+0
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-06-301-4/+0
| |\
| | * Revert "Fix Bug #67530 error_log=syslog ignored"Ferenc Kovacs2014-06-301-4/+0
* | | Merge branch 'pull-request/694' into PHP-5.6Ferenc Kovacs2014-06-301-24/+1
|\ \ \
| * | | Fix SetHandler proxy:fcgi:// incompatibilitiesDavid Zülke2014-06-121-24/+1
* | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-296-503/+662
* | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-272-0/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-272-0/+7
| |\ \ \ | | | |/ | | |/|
| | * | Fix Bug #67531 syslog cannot be set in pool configurationRemi Collet2014-06-271-0/+3
| | * | Fix Bug #67530 error_log=syslog ignoredRemi Collet2014-06-271-0/+4
* | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-252-0/+62
* | | | Better fix for phpdbg + libeditRemi Collet2014-06-232-2/+5
* | | | Fix https://github.com/krakjoe/phpdbg/issues/91Remi Collet2014-06-235-6/+15
* | | | Update copyright year to 2014Lior Kaplan2014-06-181-1/+1
* | | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-06-181-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-06-181-1/+1
| |\ \ \ | | |/ /
| | * | Update copyright year to 2014Lior Kaplan2014-06-171-1/+1
* | | | Update copyright year to 2014Lior Kaplan2014-06-162-2/+2
* | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-156-16/+52
* | | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-06-122-0/+51
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-06-122-0/+51
| |\ \ \ | | |/ /
| | * | Add 308 and 426 to the HTTP response code map in the CLI server.Adam Harvey2014-06-122-0/+51
* | | | fix merge from php 5.5 (already fixed, differently)Remi Collet2014-06-101-5/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-101-3/+3
| |\ \ \ | | |/ /
| | * | Fixed bug #67406 built-in web-server segfaults on startupRemi Collet2014-06-101-3/+3
* | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-0912-3043/+1522
* | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-045-19/+28
* | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-032-13/+36
* | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-05-031-1/+1
* | | | Added stdion/stdout/stderr constsnts and their php:// wrappersBob Weinand2014-05-011-0/+66
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-292-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-292-3/+3
| |\ \ \ | | |/ /
| | * | Fix bug #67060: use default mode of 660Stanislav Malyshev2014-04-292-3/+3
* | | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6Anatol Belski2014-04-271-2/+4
* | | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6Anatol Belski2014-04-262-6/+5
* | | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6Anatol Belski2014-04-247-17/+2026
* | | | sapi/litespeed/lsapi_main.c: Fix bug #63228George Wang2014-04-221-1/+1
* | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-04-2139-2023/+6802
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-201-1/+5
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-201-1/+5
| |\ \ \ | | |/ /
| | * | Fix #66908: php-fpm reload leaks epoll_create() file descriptorJulio Pintos2014-04-201-1/+5
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-04-161-0/+3
|\ \ \ \ | |/ / /
| * | | Fixed bug #67079 Missing MIME types for XML/XSL filesAnatol Belski2014-04-161-0/+3
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-1/+1
| |\ \ \ | | |/ /
| | * | Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in...itxx002014-04-131-1/+1
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-1/+1
| |\ \ \ | | |/ /
| | * | fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cceJeff Trawick2014-04-131-1/+1
* | | | Shut up, my lovely compiler; I do not like your warningsBob Weinand2014-04-112-3/+3