1de405907d
fpm allow process tracing/core dump on solaris systems. ( #7548 )
2021-11-03 22:26:43 +00:00
90b7bde615
Use more compact representation for packed arrays.
...
- for packed arrays we store just an array of zvals without keys.
- the elements of packed array are accessible throuf as ht->arPacked[i]
instead of ht->arData[i]
- in addition to general ZEND_HASH_FOREACH_* macros, we introduced similar
familied for packed (ZEND_HASH_PACKED_FORECH_*) and real hashes
(ZEND_HASH_MAP_FOREACH_*)
- introduced an additional family of macros to access elements of array
(packed or real hashes) ZEND_ARRAY_ELEMET_SIZE, ZEND_ARRAY_ELEMET_EX,
ZEND_ARRAY_ELEMET, ZEND_ARRAY_NEXT_ELEMENT, ZEND_ARRAY_PREV_ELEMENT
- zend_hash_minmax() prototype was changed to compare only values
Because of smaller data set, this patch may show performance improvement
on some apps and benchmarks that use packed arrays. (~1% on PHP-Parser)
TODO:
- sapi/phpdbg needs special support for packed arrays (WATCH_ON_BUCKET).
- zend_hash_sort_ex() may require converting packed arrays to hash.
2021-11-03 15:18:26 +03:00
9ab3bc69e8
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
Add FPM fix news
Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
2021-10-18 15:34:20 -07:00
0acfd2d7b5
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
Add FPM fix news
Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
2021-10-18 15:23:08 -07:00
fadb1f8c1d
Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
...
The main change is to store scoreboard procs directly to the variable sized
array rather than indirectly through the pointer.
Signed-off-by: Stanislav Malyshev <stas@php.net >
2021-10-18 15:06:36 -07:00
4cdcbc828f
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix some FPM printf warnings on openbsd
2021-10-18 11:12:23 +02:00
f71810fb6f
Fix some FPM printf warnings on openbsd
...
Closes GH-7585.
2021-10-18 11:11:33 +02:00
0c6c882b92
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Disable failing FPM test
2021-10-04 23:31:48 +02:00
cd84480e54
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Disable failing FPM test
2021-10-04 23:31:40 +02:00
a00d933242
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Disable failing FPM test
2021-10-04 23:31:31 +02:00
4c01bd2ade
Disable failing FPM test
...
Test fails intermittently, e.g.:
https://dev.azure.com/phpazuredevops/PHP/_build/results?buildId=20597&view=ms.vss-test-web.build-test-results-tab&runId=475324&resultId=115501&paneView=debug
Possibly this is because the two requests end up being processed
in sequence and no second process is spawned.
2021-10-04 23:30:14 +02:00
582cd2ca7f
Merge branch 'PHP-8.1'
2021-10-04 21:57:25 +01:00
7dd87b2343
Merge branch 'PHP-8.0' into PHP-8.1
2021-10-04 21:56:06 +01:00
9ed95846a3
Merge branch 'PHP-7.4' into PHP-8.0
2021-10-04 21:55:21 +01:00
66a655fdf4
Add the actual test for FPM prod idle timeout test with 6s sleep
2021-10-04 21:54:32 +01:00
2cd69115d5
Merge branch 'PHP-7.4' into PHP-8.0
2021-10-04 21:53:34 +01:00
edfb347019
Add FPM prod idle timeout test with 6s sleep
2021-10-04 21:50:57 +01:00
17a237a561
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Revert "Add FPM prod idle timeout test"
2021-10-04 10:17:18 +02:00
0431bd3137
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Revert "Add FPM prod idle timeout test"
[ci skip] Fix missing NEWS
[ci skip] Add missing NEWS
2021-10-04 10:17:07 +02:00
987aee10a9
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Revert "Add FPM prod idle timeout test"
2021-10-04 10:16:53 +02:00
69514e6ffb
Revert "Add FPM prod idle timeout test"
...
This reverts commit 08f52b1643
2021-10-04 10:16:20 +02:00
cbdcb0e46f
Merge branch 'PHP-8.1'
2021-10-02 18:32:20 +01:00
4ef6280b9a
Fix conflicting pattern wrapping in FPM openmetrics test
2021-10-02 18:31:49 +01:00
390d4e94ed
Merge branch 'PHP-8.0' into PHP-8.1
2021-10-02 18:29:25 +01:00
ca3f20209f
Merge branch 'PHP-7.4' into PHP-8.0
2021-10-02 18:27:47 +01:00
08f52b1643
Add FPM prod idle timeout test
2021-10-02 18:26:18 +01:00
83697aa95e
fpm allow to ptrace/make the the process dumpable for FreeBSD. ( #7375 )
2021-09-27 21:16:23 +01:00
590af4678b
Sync the FPM openmetrics status with php-fpm_exporter
2021-07-21 19:58:36 +01:00
1f9b044c80
Merge branch 'PHP-8.0'
...
* PHP-8.0:
Fix #80849 : HTTP Status header truncation
2021-07-15 19:16:21 +02:00
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
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
aff365871a
Fixed some spaces used instead of tabs
2021-06-29 11:30:26 +02:00
9871a624bf
Clean up some more function_exists() checks
2021-06-14 15:47:08 +02:00
e7135cb817
Use zend_string_equals_* API in a couple of more place
...
Closes GH-6979
2021-05-14 13:45:17 +01:00
ff988a6f4f
Fix remaining [-Wstrict-prototypes] warnings
...
Two missing void qualifiers for parameter list.
2021-05-12 19:02:48 +01:00
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
8b8c8fd79c
Merge branch 'PHP-8.0'
...
* PHP-8.0:
missing ;
2021-05-11 11:11:35 +02:00
33a93b5ed7
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
missing ;
2021-05-11 11:10:52 +02:00
ef3e0ee08a
missing ;
2021-05-11 11:10:38 +02:00
3318dcc8ef
Merge branch 'PHP-8.0'
...
* PHP-8.0:
php-fpm: fix Solaris port events.mechanism
2021-05-11 11:08:35 +02:00
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
04078a597c
php-fpm: fix Solaris port events.mechanism
...
Bug #65800
Fix by: rainer.jung@kippdata.de
2021-05-11 11:01:38 +02:00
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
8667dc92aa
Merge branch 'PHP-8.0'
...
* PHP-8.0:
Fix misleading error message
2021-04-20 15:45:26 +02:00
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
263f14ac60
Fix misleading error message
...
Closes GH-6889.
2021-04-20 15:41:42 +02:00
0c7cdbbaba
Merge branch 'PHP-8.0'
...
* PHP-8.0:
Fix return type of sparc atomic helper
2021-04-13 14:37:26 +02:00
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
5ccb5fd91e
Fix return type of sparc atomic helper
...
Closes GH-6808.
2021-04-13 14:36:58 +02:00
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
David CARLIER