Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | Merge branch 'PHP-5.6' | krakjoe | 2014-02-02 | 1 | -3/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | better use of tmpnam/mkstemp | krakjoe | 2014-02-02 | 1 | -3/+26 |
* | | | | Merge branch 'PHP-5.6' | krakjoe | 2014-02-02 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | update version | krakjoe | 2014-02-02 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.6' | krakjoe | 2014-02-02 | 1 | -34/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | remove use of zend directly, avoid leaks/bugs in modules etc | krakjoe | 2014-02-02 | 1 | -34/+9 |
* | | | | Merge branch 'PHP-5.6' | Anatol Belski | 2014-01-19 | 1 | -1/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix C89 compat | Anatol Belski | 2014-01-19 | 1 | -1/+3 |
* | | | | Merge branch 'PHP-5.6' | Johannes Schlüter | 2014-01-18 | 5 | -57/+82 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'phpdbg' into PHP-5.6 | Johannes Schlüter | 2014-01-18 | 5 | -57/+82 |
| * | | | fix indentation | Antony Dovgal | 2014-01-17 | 7 | -54/+59 |
| * | | | Add some basic and apparmor tests to fpm | Gernot Vormayr | 2014-01-17 | 6 | -0/+250 |
| * | | | Add --force-stderr to fpm | Gernot Vormayr | 2014-01-17 | 4 | -5/+16 |
| * | | | Add apparmor change hat functionality to fpm | Gernot Vormayr | 2014-01-17 | 4 | -0/+56 |
* | | | | fix indentation | Antony Dovgal | 2014-01-17 | 7 | -54/+59 |
* | | | | Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src | Antony Dovgal | 2014-01-16 | 14 | -5/+322 |
|\ \ \ \ | |||||
| * | | | | Add some basic and apparmor tests to fpm | Gernot Vormayr | 2014-01-07 | 6 | -0/+250 |
| * | | | | Add --force-stderr to fpm | Gernot Vormayr | 2014-01-07 | 4 | -5/+16 |
| * | | | | Add apparmor change hat functionality to fpm | Gernot Vormayr | 2013-07-02 | 4 | -0/+56 |
* | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2014-01-03 | 88 | -95/+95 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Bump year | Xinchen Hui | 2014-01-03 | 88 | -95/+95 |
* | | | | | Merge branch 'PHP-5.6' | krakjoe | 2013-12-27 | 1 | -2/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | update version output | krakjoe | 2013-12-27 | 1 | -2/+1 |
* | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2013-12-27 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed bug #66358 (fpm starts segfault) | Xinchen Hui | 2013-12-27 | 1 | -1/+1 |
* | | | | | Merge branch 'PHP-5.6' | Anatol Belski | 2013-12-25 | 1 | -2/+1 |
|\ \ \ \ \ | |/ / / / |