Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.6' | Anatol Belski | 2014-04-16 | 1 | -0/+3 |
|\ | |||||
| * | 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.6' | Stanislav Malyshev | 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 bug #66482, replace wrong item name 'priority' with 'process.priority' in... | itxx00 | 2014-04-13 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 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 |
* | | | | Merge branch 'PHP-5.6' | Bob Weinand | 2014-04-11 | 2 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Shut up, my lovely compiler; I do not like your warnings | Bob Weinand | 2014-04-11 | 2 | -3/+3 |
* | | | | Merge branch 'PHP-5.6' | Ferenc Kovacs | 2014-04-07 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | add missing skip to the output, so we actually skip this test | Ferenc Kovacs | 2014-04-07 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.6' | Michael Wallner | 2014-03-24 | 2 | -37/+30 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix some warnings | Michael Wallner | 2014-03-24 | 1 | -5/+1 |
| * | | | PHP-5.6 compatibility for apache2 filter SAPI | Michael Wallner | 2014-03-24 | 2 | -34/+31 |
* | | | | Merge branch 'PHP-5.6' | Anatol Belski | 2014-03-24 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-03-24 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-03-24 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed bug #65715 php5embed.lib isn't provided anymore | Anatol Belski | 2014-03-24 | 1 | -0/+2 |
* | | | | Merge branch 'PHP-5.6' | Mateusz Kocielski | 2014-03-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed wrong indentation | Mateusz Kocielski | 2014-03-18 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.6' | Mateusz Kocielski | 2014-03-18 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix phpdbg build on FreeBSD | Mateusz Kocielski | 2014-03-18 | 1 | -0/+1 |
* | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-02-28 | 1 | -10/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-02-28 | 1 | -10/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-02-28 | 1 | -10/+1 |
| | |\ \ | | | |/ | |||||
| | | * | man page: long option name is --strip, not --stripped | Remi Collet | 2014-02-28 | 1 | -1/+1 |
| | | * | --global have be removed in 5.2 | Remi Collet | 2014-02-28 | 1 | -9/+0 |
| | | * | add clear_env option to FPM config | Paul Annesley | 2014-02-25 | 4 | -1/+16 |
| | | * | Bump year | Xinchen Hui | 2014-01-03 | 62 | -70/+70 |
| | | * | Fix bug #66008 | Rasmus Lerdorf | 2013-10-31 | 1 | -0/+1 |
| | * | | add clear_env option to FPM config | Paul Annesley | 2014-02-25 | 4 | -1/+16 |
| | * | | Bump year | Xinchen Hui | 2014-01-03 | 66 | -74/+74 |
| * | | | add clear_env option to FPM config | Paul Annesley | 2014-02-24 | 4 | -1/+16 |
* | | | | add clear_env option to FPM config | Paul Annesley | 2014-02-24 | 4 | -1/+16 |
* | | | | Merge branch 'PHP-5.6' | Lior Kaplan | 2014-02-14 | 2 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | a few typofixes | Veres Lajos | 2014-02-14 | 2 | -4/+4 |
* | | | | Merge branch 'PHP-5.6' | Yasuo Ohgaki | 2014-02-13 | 20 | -40/+40 |
|\ \ \ \ | |/ / / | |||||
| * | | | Implement RFC https://wiki.php.net/rfc/default_encoding | Yasuo Ohgaki | 2014-02-13 | 20 | -40/+40 |
* | | | | Merge branch 'PHP-5.6' | krakjoe | 2014-02-02 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | windows | krakjoe | 2014-02-02 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.6' | krakjoe | 2014-02-02 | 1 | -0/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | clean symbols | krakjoe | 2014-02-02 | 1 | -0/+6 |
* | | | | Merge branch 'PHP-5.6' | krakjoe | 2014-02-02 | 1 | -7/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | another patch from upstream | krakjoe | 2014-02-02 | 1 | -7/+14 |
* | | | | Merge branch 'PHP-5.6' | krakjoe | 2014-02-02 | 1 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | woops | krakjoe | 2014-02-02 | 1 | -2/+4 |