summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Expand)AuthorAgeFilesLines
* Use zend_string_release_ex() instread of zend_string_release() in places, whe...Dmitry Stogov2018-05-282-2/+2
* Merge branch 'PHP-7.2'Jakub Zelenka2018-04-131-3/+8
|\
| * Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-04-131-3/+8
| |\
| | * Support using acl_* functions on *BSDMichał Górny2018-04-131-3/+8
* | | Merge branch 'PHP-7.2'Jakub Zelenka2018-03-302-23/+69
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-03-302-24/+70
| |\ \ | | |/
| | * Prevent modifying of getenv resultJakub Zelenka2018-03-301-5/+14
| | * 68440: ensure backwards compatibility with FPM_SOCKETS var; fix sockname sizeJacob Hipps2018-03-301-5/+13
| | * Fix bug #68440: [sapi/fpm] use multiple FPM_SOCKETS env vars to prevent hitti...Jacob Hipps2018-03-302-25/+54
* | | Merge branch 'PHP-7.2'Anatol Belski2018-03-274-1/+11
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-03-274-1/+11
| |\ \ | | |/
| | * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2018-03-274-1/+11
| | |\
| | | * Do not set PR_SET_DUMPABLE by defaultJakub Zelenka2018-03-274-1/+11
* | | | Use EXPECT instead of EXPECTF when possibleGabriel Caruso2018-02-202-2/+2
* | | | Remove trailing whitespace in inc filesGabriel Caruso2018-02-102-5/+5
* | | | Fix some misspellingsGabriel Caruso2018-02-061-1/+1
* | | | Set max_requests to 0Lee Hsun2018-02-031-1/+1
* | | | Remove double include of fpm_scoreboard.hmotecshine2018-01-151-1/+0
* | | | Trailing whitespaces on sapi/*Gabriel Caruso2018-01-041-1/+1
* | | | Trailing whitespacesGabriel Caruso2018-01-032-4/+4
* | | | Merge branch 'PHP-7.2'Xinchen Hui2018-01-031-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.1' into PHP-7.2Xinchen Hui2018-01-031-2/+2
| |\ \ \ | | |/ /
| | * | Happy new year (Update copyright to 2018)Lior Kaplan2018-01-021-2/+2
| | * | year++Xinchen Hui2018-01-0213-15/+15
| * | | year++Xinchen Hui2018-01-0213-15/+15
* | | | year++Xinchen Hui2018-01-0213-15/+15
* | | | Use array specific functionsDmitry Stogov2017-12-071-4/+4
* | | | Fix some printf() specifier usagesSebastian Ramadan2017-11-211-15/+15
* | | | Disable RC_DEBUG for FPM initialisationDmitry Stogov2017-11-031-1/+16
* | | | Join untracked files to root .gitignorePeter Kokot2017-10-051-4/+0
* | | | Merge branch 'PHP-7.2'Joe Watkins2017-10-031-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-10-031-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-10-031-1/+1
| | |\ \ | | | |/
| | | * Typo in status.htmlViktor Szépe2017-10-031-1/+1
* | | | Merge branch 'PHP-7.2'Remi Collet2017-09-191-0/+0
|\ \ \ \ | |/ / /
| * | | rename testRemi Collet2017-09-191-0/+0
* | | | Merge branch 'PHP-7.2'Remi Collet2017-09-183-1/+87
|\ \ \ \ | |/ / /
| * | | Fixed Bug #75212 php_value acts like php_admin_valueRemi Collet2017-09-183-1/+87
* | | | Fixed typo in FPM error messageFabien Potencier2017-08-231-1/+1
|/ / /
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-07-241-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-241-2/+2
| |\ \ | | |/
| | * Update copyright year to 2017Peter Kokot2017-07-241-2/+2
* | | Remove superfluous semicolonsTom Van Looy2017-06-261-5/+5
* | | Remove `user=foo` from FPM test configSara Golemon2017-05-242-2/+0
* | | Skip FPM tests when running as root (unless requested)Sara Golemon2017-05-242-2/+9
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-05-091-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-091-1/+1
| |\ \ | | |/
| | * Fix typo: exectute => executeAndrew Marcinkevičius2017-05-081-1/+1
* | | Try fallback on IPv4 ANYADDR when IPv6 ANYADDR failsSara Golemon2017-03-082-29/+114
* | | Merge branch 'PHP-7.1'Joe Watkins2017-02-221-5/+9
|\ \ \ | |/ /