php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
126,190 Commits 549 Branches 1,484 Tags
e6e47cb2558d04ca587bc92f0909dc9d1a0edd4e
Commit Graph

1057 Commits

Author SHA1 Message Date
David CARLIER 83697aa95e fpm allow to ptrace/make the the process dumpable for FreeBSD. (#7375) 2021-09-27 21:16:23 +01:00
Jakub Zelenka 590af4678b Sync the FPM openmetrics status with php-fpm_exporter 2021-07-21 19:58:36 +01:00
Christoph M. Becker 1f9b044c80 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #80849: HTTP Status header truncation
 2021-07-15 19:16:21 +02:00
Christoph M. Becker bb4dbbc150 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80849: HTTP Status header truncation
 2021-07-15 19:13:58 +02:00
Christoph M. Becker a054ef2aad Fix #80849: HTTP Status header truncation 
While truncating the contents of a header is okay, we must never omit
the trailing CRLF.

Closes GH-7238.
 2021-07-15 19:10:53 +02:00
Patrick Allaert aff365871a Fixed some spaces used instead of tabs 2021-06-29 11:30:26 +02:00
Nikita Popov 9871a624bf Clean up some more function_exists() checks 2021-06-14 15:47:08 +02:00
George Peter Banyard e7135cb817 Use zend_string_equals_* API in a couple of more place 
Closes GH-6979
 2021-05-14 13:45:17 +01:00
George Peter Banyard ff988a6f4f Fix remaining [-Wstrict-prototypes] warnings 
Two missing void qualifiers for parameter list.
 2021-05-12 19:02:48 +01:00
George Peter Banyard c40231afbf Mark various functions with void arguments. 
This fixes a bunch of [-Wstrict-prototypes] warning,
because in C func() and func(void) have different semantics.
 2021-05-12 14:55:53 +01:00
Joe Watkins 8b8c8fd79c Merge branch 'PHP-8.0' 
* PHP-8.0:
  missing ;
 2021-05-11 11:11:35 +02:00
Joe Watkins 33a93b5ed7 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  missing ;
 2021-05-11 11:10:52 +02:00
Joe Watkins ef3e0ee08a missing ; 2021-05-11 11:10:38 +02:00
Joe Watkins 3318dcc8ef Merge branch 'PHP-8.0' 
* PHP-8.0:
  php-fpm: fix Solaris port events.mechanism
 2021-05-11 11:08:35 +02:00
Joe Watkins 6ccbaa12e0 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  php-fpm: fix Solaris port events.mechanism
 2021-05-11 11:07:47 +02:00
Petr Sumbera 04078a597c php-fpm: fix Solaris port events.mechanism 
Bug #65800
Fix by: rainer.jung@kippdata.de
 2021-05-11 11:01:38 +02:00
KsaR 01b3fc03c3 Update http->https in license (#6945) 
1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |
 2021-05-06 12:16:35 +02:00
Christoph M. Becker 8667dc92aa Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix misleading error message
 2021-04-20 15:45:26 +02:00
Christoph M. Becker 0f40426450 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix misleading error message
 2021-04-20 15:43:04 +02:00
Christoph M. Becker 263f14ac60 Fix misleading error message 
Closes GH-6889.
 2021-04-20 15:41:42 +02:00
Nikita Popov 0c7cdbbaba Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix return type of sparc atomic helper
 2021-04-13 14:37:26 +02:00
Nikita Popov ec24f14820 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix return type of sparc atomic helper
 2021-04-13 14:37:18 +02:00
David Carlier 5ccb5fd91e Fix return type of sparc atomic helper 
Closes GH-6808.
 2021-04-13 14:36:58 +02:00
Josh Soref 462da6e09c Fix spelling and grammar mistakes 
This PR corrects misspellings identified by the check-spelling action.

The misspellings have been reported at jsoref@b6ba3e2#commitcomment-48946465

The action reports that the changes in this PR would make it happy: jsoref@602417c

Closes GH-6822.
 2021-04-13 12:09:37 +02:00
George Peter Banyard 5caaf40b43 Introduce pseudo-keyword ZEND_FALLTHROUGH 
And use it instead of comments
 2021-04-07 00:46:29 +01:00
Jakub Zelenka 4361fffaea Add extra run test for pm.max_spawn_rate 2021-03-28 21:06:45 +01:00
Paulius Sapragonas eac1609a84 Max spawn child processes rate an once 
* Add functionality to expect log config options
 2021-03-28 20:53:58 +01:00
Nikita Popov 74075896e1 Revert "Do not check exact values of unstable metrices in FPM status test" 
This reverts commit 5b01c4863f.

The previous commit fixes the 32-bit issue. Maybe this one is also
needed, but let's see if any failures of this form turn up first.
 2021-03-24 10:07:56 +01:00
Nikita Popov 9403840ae3 Fix printf type in fpm status 2021-03-24 10:07:53 +01:00
Jakub Zelenka 5b01c4863f Do not check exact values of unstable metrices in FPM status test 2021-03-23 22:10:30 +00:00
Jakub Zelenka 72a22d92cd Fix types in FPM status openmetrics format 2021-03-22 21:32:15 +00:00
Jakub Zelenka 118cd3efd3 Merge branch 'PHP-8.0' 2021-03-21 19:01:50 +00:00
Jakub Zelenka 713b82131b Merge branch 'PHP-7.4' into PHP-8.0 2021-03-21 19:00:38 +00:00
Jakub Zelenka c483b59124 Fix bug #80024: Duplication of info about inherited socket after pool removing 2021-03-21 18:52:07 +00:00
David CARLIER d54fa6f778 fpm master/child process rename, enable on mac os. 
Note the change appears mainly in command like ps.
 2021-03-21 18:36:12 +00:00
Jakub Zelenka c6c571d92b Fix indent in FPM openmetrics status 2021-03-21 18:24:46 +00:00
Cees-Jan Kiewiet d36ac9640a Add support for openmetrics formatting to FPM status 2021-03-21 18:08:53 +00:00
Máté Kocsis bf0f6aaf18 Improve class entry generation 
Related to GH-6701
 2021-02-16 13:09:56 +01:00
David Carlier fe01a7c515 Avoid repeatedly calling strlen in FPM setproctitle implementation 
Closes GH-6689.
 2021-02-15 11:29:18 +01:00
Máté Kocsis 31088eef45 Enable class entry generation for sapi extensions 2021-02-14 12:03:48 +01:00
Nikita Popov d281cd8b4b Merge branch 'PHP-8.0' 
* PHP-8.0:
  Update year to 2021
 2021-02-02 16:47:03 +01:00
Nikita Popov f1cf553437 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Update year to 2021
 2021-02-02 16:46:52 +01:00
Peter Kokot 8c04944b66 Update year to 2021 
Closes GH-6636.
 2021-02-02 16:46:16 +01:00
Nikita Popov 3e01f5afb1 Replace zend_bool uses with bool 
We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.

Of course, zend_bool is retained as an alias.
 2021-01-15 12:33:06 +01:00
Jakub Zelenka 97d2dd0f90 Merge branch 'PHP-8.0' 2020-12-13 18:43:04 +00:00
Jakub Zelenka d254078020 Merge branch 'PHP-7.4' into PHP-8.0 2020-12-13 18:42:11 +00:00
Jakub Zelenka a221e17b41 Fix bug #69625: FPM returns 200 status on request without SCRIPT_FILENAME 2020-12-13 18:39:48 +00:00
Nikita Popov dbfa6aa9c4 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Revert "Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree"
 2020-10-19 11:24:26 +02:00
Nikita Popov c97da0f819 Revert "Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree" 
This reverts commit 98bfad738a.

This doesn't work well in some setups, see bug #80113 and GH-5051.
Reverting this for now.
 2020-10-19 11:23:00 +02:00
George Peter Banyard 150ebfdf77 Suppress bogus [-Wlogical-op] warning from GCC 
See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602
which emits the warning for (errno == EWOULDBLOCK || errno == EAGAIN)
which is the correct way of handling errors as the value of EWOULDBLOCK
and EAGAIN is implementation defined.

Therefore introduce a new macro function PHP_IS_TRANSIENT_ERROR()
which handles the case when EWOULDBLOCK and EAGAIN are identical.

Thanks to @twose for the idea.
 2020-10-10 14:45:20 +01:00