summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Anatol Belski2014-04-161-0/+3
|\
| * 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.6'Stanislav Malyshev2014-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 bug #66482, replace wrong item name 'priority' with 'process.priority' in...itxx002014-04-131-1/+1
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-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
* | | | Merge branch 'PHP-5.6'Bob Weinand2014-04-112-3/+3
|\ \ \ \ | |/ / /
| * | | Shut up, my lovely compiler; I do not like your warningsBob Weinand2014-04-112-3/+3
* | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-04-071-1/+1
|\ \ \ \ | |/ / /
| * | | add missing skip to the output, so we actually skip this testFerenc Kovacs2014-04-071-1/+1
* | | | Merge branch 'PHP-5.6'Michael Wallner2014-03-242-37/+30
|\ \ \ \ | |/ / /
| * | | fix some warningsMichael Wallner2014-03-241-5/+1
| * | | PHP-5.6 compatibility for apache2 filter SAPIMichael Wallner2014-03-242-34/+31
* | | | Merge branch 'PHP-5.6'Anatol Belski2014-03-241-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-03-241-0/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-03-241-0/+2
| | |\ \ | | | |/
| | | * Fixed bug #65715 php5embed.lib isn't provided anymoreAnatol Belski2014-03-241-0/+2
* | | | Merge branch 'PHP-5.6'Mateusz Kocielski2014-03-181-1/+1
|\ \ \ \ | |/ / /
| * | | Fixed wrong indentationMateusz Kocielski2014-03-181-1/+1
* | | | Merge branch 'PHP-5.6'Mateusz Kocielski2014-03-181-0/+1
|\ \ \ \ | |/ / /
| * | | Fix phpdbg build on FreeBSDMateusz Kocielski2014-03-181-0/+1
* | | | 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