summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-241-2/+2
|\
| * Update copyright year to 2017Peter Kokot2017-07-241-2/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-091-1/+1
|\ \ | |/
| * Fix typo: exectute => executeAndrew Marcinkevičius2017-05-081-1/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-02-221-5/+9
|\ \ | |/
| * pull-request/2393:Coenraad Loubser2017-02-221-5/+9
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-121-1/+2
|\ \ | |/
| * Fixed bug #69860Denis Yeldandi2017-02-121-1/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-01-291-4/+10
|\ \ | |/
| * Try fpm path for testing in sbin as it is default targetJakub Zelenka2017-01-291-4/+10
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-231-0/+6
|\ \ | |/
| * Fix Bug #69865 php-fpm does not close stderr when using syslogMichael Wallner2017-01-231-0/+6
* | use correct shift and fix slowlog bt in 7.1Antony Dovgal2017-01-231-2/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-136-7/+7
|\ \ | |/
| * Increase wait time for tests involving sockets to improve Travis relabilityMitch Hagstrand2017-01-136-7/+7
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-089-14/+19
|\ \ | |/
| * improve FPM tests (mostly for systemd build)Remi Collet2017-01-089-14/+19
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-071-2/+1
|\ \ | |/
| * Fixed bug #67583Nikita Popov2017-01-071-2/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-076-17/+17
|\ \ | |/
| * Fixes for session and fpm tests in PHP7.0 branchMitch Hagstrand2017-01-066-17/+17
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-061-2/+4
|\ \ | |/
| * Merge branch 'pull-request/1311' into PHP-7.0Joe Watkins2017-01-061-2/+4
| |\
| | * improperlogredfoxli2015-05-301-2/+4
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-051-3/+3
|\ \ \ | |/ /
| * | Merge branch 'pull-request/1256' into PHP-7.0Joe Watkins2017-01-051-3/+3
| |\ \
| | * | Fix php-fpm.service.inFloris Bos2015-05-011-3/+3
| * | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0413-15/+15
* | | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0413-15/+15
* | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-12-031-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-12-031-1/+1
| |\ \ \
| | * | | Fix minor typoAdrien Crivelli2016-12-031-1/+1
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-11-204-6/+7
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Revert "Remove a few unused write warning""Bob Weinand2016-11-204-6/+7
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-11-204-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Remove a few unused write warning (backport from master, oops)s"Nikita Popov2016-11-204-6/+6
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-11-204-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Remove a few unused write warning (backport from master, oops)sBob Weinand2016-11-204-6/+6
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Dmitry Stogov2016-11-171-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fixed testDmitry Stogov2016-11-171-1/+1
| * | | | Merge branch 'pull-request/2097'Joe Watkins2016-10-171-2/+4
* | | | | Merge branch 'pull-request/2097'Joe Watkins2016-10-171-2/+4
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-231-16/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-231-17/+20
| |\ \ \ \ | | |/ / /
| | * | | Formatting. Fix possible memory corruption in FPM SHM managementJulien Pauli2016-09-231-12/+16
| | * | | fix every work call mmaptom9162016-09-231-13/+12
| | * | | Fix bug #72836 - integer overflow in base64_decode caused heap corruptionStanislav Malyshev2016-08-161-0/+413
* | | | | Fix some typos in PHP FPM configurationMatthias Endler2016-08-151-6/+6
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2016-07-222-3/+84
|\ \ \ \ \ | |/ / / /