summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2019-10-213-4/+72
|\ | | | | | | | | | | | | * PHP-7.1: Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) bump versions after release set versions for release
| * Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)Jakub Zelenka2019-10-203-4/+72
| |
| * Sync leading and final newlines in *.phpt sectionsPeter Kokot2018-10-154-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| * Sync leading and final newlines in source code filesPeter Kokot2018-10-1458-89/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| * Trim trailing whitespace in source code filesPeter Kokot2018-10-137-44/+44
| |
* | Add tilde to allowed status/ping pathDrakano2019-09-171-4/+4
| | | | | | | | | | | | | | Because of user specific webdirs it should be possible to set a status/ping path like "/~username/status". Closes GH-4698.
* | Add ping to the fpm test for bug #77934Jakub Zelenka2019-05-131-0/+4
| |
* | Fix bug #77934 (php-fpm kill -USR2 not working)Jakub Zelenka2019-05-112-1/+45
| |
* | Fix #77921: static.php.net doesn't work anymorePeter Kokot2019-04-201-1/+1
| | | | | | | | | | | | | | | | This embeds the PHP logo image in the FPM status HTML page instead of using remote location. The phpinfo() output also uses such approach and browser compatibility looks decent [1]. 1: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
* | Fix bug #77677: WCOREDUMP not available on all systemsKevin Adler2019-03-011-0/+4
| | | | | | | | | | | | Add #ifdef WCOREDUMP around all uses. Also Change core dump message to yes/no/unknown in lsapilib.
* | Sync leading and final newlines in *.phpt sectionsPeter Kokot2018-10-154-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* | Sync leading and final newlines in source code filesPeter Kokot2018-10-1458-89/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* | Trim trailing whitespace in source code filesPeter Kokot2018-10-137-44/+44
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-06-203-6/+47
|\ \ | |/
| * Fixed bug #73342Nikita Popov2018-06-203-6/+47
| | | | | | | | | | Directly listen on socket, instead of duping it to STDIN and listening on that.
* | Port FPM test 023 and 024 to the new FPM testingJakub Zelenka2018-06-124-139/+100
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Jakub Zelenka2018-06-1252-1684/+3379
|\ \ | |/
| * Rewrite FPM testsJakub Zelenka2018-06-1252-1680/+3381
| |
* | 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
| | | | | | | | | | | | The *BSD systems have ACL routines built-in in libc rather than in separate libacl. Update the configure check to detect that and enable ACL support without adding 'acl' library.
* | 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 ↵Jacob Hipps2018-03-302-25/+54
| | | | | | | | hitting MAX_ARG_STRLEN with a large number of pools
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-03-274-1/+11
|\ \ | |/ | | | | | | | | * PHP-7.1: Do not set PR_SET_DUMPABLE by default Do not set PR_SET_DUMPABLE by default
| * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2018-03-274-1/+11
| |\ | | | | | | | | | | | | | | | * PHP-7.0: Do not set PR_SET_DUMPABLE by default Do not set PR_SET_DUMPABLE by default
| | * Do not set PR_SET_DUMPABLE by defaultJakub Zelenka2018-03-274-1/+11
| | |
* | | Merge branch 'PHP-7.1' into PHP-7.2Xinchen Hui2018-01-031-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Happy new year (Update copyright to 2018)
| * | 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
| | |
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-10-031-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Typo in status.html
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-10-031-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Typo in status.html
| | * Typo in status.htmlViktor Szépe2017-10-031-1/+1
| | | | | | | | | | | | feet needs -> fit needs
* | | rename testRemi Collet2017-09-191-0/+0
| | |
* | | Fixed Bug #75212 php_value acts like php_admin_valueRemi Collet2017-09-183-1/+87
| | |
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-07-241-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Update copyright year to 2017
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-241-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Update copyright year to 2017
| | * 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
| | | | | | | | | | | | | | | This setting has nothing to do with what's being tested, and on any system without a "foo" user we'll get a spurious error.
* | | Skip FPM tests when running as root (unless requested)Sara Golemon2017-05-242-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FPM must be configured as a user. Normally it defaults to the current user, but if that's root it'll fail to startup unless the --run-as-root option is provided. Extend that logic into the test runner so that we don't fail for stupid reasons. If you're running `make test` as root and you want FPM tests to run anyway, set TEST_FPM_RUN_AS_ROOT=1 in your environment.
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-05-091-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Fix typo: exectute => execute
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-091-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Fix typo: exectute => execute
| | * Fix typo: exectute => executeAndrew Marcinkevičius2017-05-081-1/+1
| | |
* | | Try fallback on IPv4 ANYADDR when IPv6 ANYADDR failsSara Golemon2017-03-082-29/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.php.net/bug.php?id=74166 A host system with no/limited IPv6 support will fail at binding the IPv6 ANYADDR address (::) as the address family is unsupported. Deal with this by handling failure to implicitly bind to :: as a soft failure, falling back to 0.0.0.0. If binding to :: failed for some other reason (e.g. port in use) then binding to 0.0.0.0 will likely fail as well, but we'll get appropriate warnings for that.
* | | Merge branch 'PHP-7.1'Joe Watkins2017-02-221-5/+9
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.1: pull-request/2393: stop fpm make install clobbering dot d configuration
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-02-221-5/+9
| |\ \ | | |/ | | | | | | | | | | | | * PHP-7.0: pull-request/2393: stop fpm make install clobbering dot d configuration
| | * pull-request/2393:Coenraad Loubser2017-02-221-5/+9
| | | | | | | | | | | | stop make install from clobbering default dot d configuration
* | | Merge branch 'PHP-7.1'Nikita Popov2017-02-121-1/+2
|\ \ \ | |/ /
View Lorry Controller Status