Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-06-30 | 1 | -4/+0 |
|\ | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-06-30 | 1 | -4/+0 |
| |\ | |||||
| | * | Revert "Fix Bug #67530 error_log=syslog ignored" | Ferenc Kovacs | 2014-06-30 | 1 | -4/+0 |
* | | | Merge branch 'pull-request/694' into PHP-5.6 | Ferenc Kovacs | 2014-06-30 | 1 | -24/+1 |
|\ \ \ | |||||
| * | | | Fix SetHandler proxy:fcgi:// incompatibilities | David Zülke | 2014-06-12 | 1 | -24/+1 |
* | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-06-29 | 6 | -503/+662 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-27 | 2 | -0/+7 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-27 | 2 | -0/+7 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix Bug #67531 syslog cannot be set in pool configuration | Remi Collet | 2014-06-27 | 1 | -0/+3 |
| | * | | Fix Bug #67530 error_log=syslog ignored | Remi Collet | 2014-06-27 | 1 | -0/+4 |
* | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-06-25 | 2 | -0/+62 |
* | | | | Better fix for phpdbg + libedit | Remi Collet | 2014-06-23 | 2 | -2/+5 |
* | | | | Fix https://github.com/krakjoe/phpdbg/issues/91 | Remi Collet | 2014-06-23 | 5 | -6/+15 |
* | | | | Update copyright year to 2014 | Lior Kaplan | 2014-06-18 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Lior Kaplan | 2014-06-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Lior Kaplan | 2014-06-18 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Update copyright year to 2014 | Lior Kaplan | 2014-06-17 | 1 | -1/+1 |
* | | | | Update copyright year to 2014 | Lior Kaplan | 2014-06-16 | 2 | -2/+2 |
* | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-06-15 | 6 | -16/+52 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-06-12 | 2 | -0/+51 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-06-12 | 2 | -0/+51 |
| |\ \ \ | | |/ / | |||||
| | * | | Add 308 and 426 to the HTTP response code map in the CLI server. | Adam Harvey | 2014-06-12 | 2 | -0/+51 |
* | | | | fix merge from php 5.5 (already fixed, differently) | Remi Collet | 2014-06-10 | 1 | -5/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-10 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed bug #67406 built-in web-server segfaults on startup | Remi Collet | 2014-06-10 | 1 | -3/+3 |
* | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-06-09 | 12 | -3043/+1522 |
* | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-06-04 | 5 | -19/+28 |
* | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-06-03 | 2 | -13/+36 |
* | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-05-03 | 1 | -1/+1 |
* | | | | Added stdion/stdout/stderr constsnts and their php:// wrappers | Bob Weinand | 2014-05-01 | 1 | -0/+66 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-29 | 2 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-29 | 2 | -3/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix bug #67060: use default mode of 660 | Stanislav Malyshev | 2014-04-29 | 2 | -3/+3 |
* | | | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 | Anatol Belski | 2014-04-27 | 1 | -2/+4 |
* | | | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 | Anatol Belski | 2014-04-26 | 2 | -6/+5 |
* | | | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 | Anatol Belski | 2014-04-24 | 7 | -17/+2026 |
* | | | | sapi/litespeed/lsapi_main.c: Fix bug #63228 | George Wang | 2014-04-22 | 1 | -1/+1 |
* | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-04-21 | 39 | -2023/+6802 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-20 | 1 | -1/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-20 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix #66908: php-fpm reload leaks epoll_create() file descriptor | Julio Pintos | 2014-04-20 | 1 | -1/+5 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-04-16 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug #67079 Missing MIME types for XML/XSL files | Anatol Belski | 2014-04-16 | 1 | -0/+3 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in... | itxx00 | 2014-04-13 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce | Jeff Trawick | 2014-04-13 | 1 | -1/+1 |
* | | | | Shut up, my lovely compiler; I do not like your warnings | Bob Weinand | 2014-04-11 | 2 | -3/+3 |