summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Remi Collet2014-02-281-10/+1
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-02-281-10/+1
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-02-281-10/+1
| | |\
| | | * man page: long option name is --strip, not --strippedRemi Collet2014-02-281-1/+1
| | | * --global have be removed in 5.2Remi Collet2014-02-281-9/+0
| | | * add clear_env option to FPM configPaul Annesley2014-02-254-1/+16
| | | * Bump yearXinchen Hui2014-01-0362-70/+70
| | | * Fix bug #66008Rasmus Lerdorf2013-10-311-0/+1
| | * | add clear_env option to FPM configPaul Annesley2014-02-254-1/+16
| | * | Bump yearXinchen Hui2014-01-0366-74/+74
| * | | add clear_env option to FPM configPaul Annesley2014-02-244-1/+16
* | | | add clear_env option to FPM configPaul Annesley2014-02-244-1/+16
* | | | Merge branch 'PHP-5.6'Lior Kaplan2014-02-142-4/+4
|\ \ \ \ | |/ / /
| * | | a few typofixesVeres Lajos2014-02-142-4/+4
* | | | Merge branch 'PHP-5.6'Yasuo Ohgaki2014-02-1320-40/+40
|\ \ \ \ | |/ / /
| * | | Implement RFC https://wiki.php.net/rfc/default_encodingYasuo Ohgaki2014-02-1320-40/+40
* | | | Merge branch 'PHP-5.6'krakjoe2014-02-021-1/+1
|\ \ \ \ | |/ / /
| * | | windowskrakjoe2014-02-021-1/+1
* | | | Merge branch 'PHP-5.6'krakjoe2014-02-021-0/+6
|\ \ \ \ | |/ / /
| * | | clean symbolskrakjoe2014-02-021-0/+6
* | | | Merge branch 'PHP-5.6'krakjoe2014-02-021-7/+14
|\ \ \ \ | |/ / /
| * | | another patch from upstreamkrakjoe2014-02-021-7/+14
* | | | Merge branch 'PHP-5.6'krakjoe2014-02-021-2/+4
|\ \ \ \ | |/ / /
| * | | woopskrakjoe2014-02-021-2/+4
* | | | Merge branch 'PHP-5.6'krakjoe2014-02-021-3/+26
|\ \ \ \ | |/ / /
| * | | better use of tmpnam/mkstempkrakjoe2014-02-021-3/+26
* | | | Merge branch 'PHP-5.6'krakjoe2014-02-021-1/+1
|\ \ \ \ | |/ / /
| * | | update versionkrakjoe2014-02-021-1/+1
* | | | Merge branch 'PHP-5.6'krakjoe2014-02-021-34/+9
|\ \ \ \ | |/ / /
| * | | remove use of zend directly, avoid leaks/bugs in modules etckrakjoe2014-02-021-34/+9
* | | | Merge branch 'PHP-5.6'Anatol Belski2014-01-191-1/+3
|\ \ \ \ | |/ / /
| * | | fix C89 compatAnatol Belski2014-01-191-1/+3
* | | | Merge branch 'PHP-5.6'Johannes Schlüter2014-01-185-57/+82
|\ \ \ \ | |/ / /
| * | | Merge branch 'phpdbg' into PHP-5.6Johannes Schlüter2014-01-185-57/+82
| * | | fix indentationAntony Dovgal2014-01-177-54/+59
| * | | Add some basic and apparmor tests to fpmGernot Vormayr2014-01-176-0/+250
| * | | Add --force-stderr to fpmGernot Vormayr2014-01-174-5/+16
| * | | Add apparmor change hat functionality to fpmGernot Vormayr2014-01-174-0/+56
* | | | fix indentationAntony Dovgal2014-01-177-54/+59
* | | | Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-srcAntony Dovgal2014-01-1614-5/+322
|\ \ \ \
| * | | | Add some basic and apparmor tests to fpmGernot Vormayr2014-01-076-0/+250
| * | | | Add --force-stderr to fpmGernot Vormayr2014-01-074-5/+16
| * | | | Add apparmor change hat functionality to fpmGernot Vormayr2013-07-024-0/+56
* | | | | Merge branch 'PHP-5.6'Xinchen Hui2014-01-0388-95/+95
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Bump yearXinchen Hui2014-01-0388-95/+95
* | | | | Merge branch 'PHP-5.6'krakjoe2013-12-271-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | update version outputkrakjoe2013-12-271-2/+1
* | | | | Merge branch 'PHP-5.6'Xinchen Hui2013-12-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #66358 (fpm starts segfault)Xinchen Hui2013-12-271-1/+1
* | | | | Merge branch 'PHP-5.6'Anatol Belski2013-12-251-2/+1
|\ \ \ \ \ | |/ / / /