archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
131427 commits 526 branches 1434 tags 864 MiB
Commit graph

5955 commits

Author SHA1 Message Date
Jakub Zelenka
882cc4f804
Merge branch 'PHP-8.1' into PHP-8.2 2023-11-03 17:17:23 +00:00
Jakub Zelenka
a8c6c6165b
Fix GH-9921: Loading ext in FPM config does not register module handlers 
Closes GH-12377
 2023-11-03 16:53:09 +00:00
Jakub Zelenka
e3d1beb0f1
Fix bug #76922: FastCGI terminates conn after FCGI_GET_VALUES 
Closes GH-12387
 2023-11-03 14:06:36 +00:00
Jakub Zelenka
c776f79578
Merge branch 'PHP-8.1' into PHP-8.2 2023-10-14 18:41:48 +01:00
Jakub Zelenka
0217be4d5b
Fix GH-12232: FPM: segfault dynamically loading extension without opcache 
Also fixes incorrect assertion in ini init that php_dl is always
temporary.

Closes GH-12277
 2023-10-14 18:38:21 +01:00
Niels Dossche
a1845944ce Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  php_cli_server: ensure single date header is present
 2023-10-06 17:50:13 +02:00
coppolafab
f6ac08c6a3 php_cli_server: ensure single date header is present 
Currently the PHP Development Server appends a Date header in the
response, despite already set from user code.

Added a check condition before append the header, and a test file.

Closes GH-12363.
 2023-10-06 17:49:30 +02:00
Niels Dossche
6aa20956fb Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Ignore optional warning output in test
 2023-10-02 22:55:28 +02:00
Niels Dossche
6cf76d552e Ignore optional warning output in test 
Due to the greedy behaviour of regex, we can't seem to use %A?
Use a for loop with a marker instead to ignore module startup warnings.
 2023-10-02 22:53:39 +02:00
Niels Dossche
87cd401aaf Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix test under older CI configurations
 2023-10-02 21:52:52 +02:00
Niels Dossche
b140f6e9f8 Fix test under older CI configurations 2023-10-02 21:52:44 +02:00
Niels Dossche
28a909d40a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix #80092: ZTS + preload = segfault on shutdown
 2023-10-02 19:37:09 +02:00
Niels Dossche
bdc87b0f66 Fix #80092: ZTS + preload = segfault on shutdown 
After preloading has executed, the executor globals for class_table and
function_table are still referring to the values during preloading.
If no request happens after that then these values will remain dangling
pointers. If then the -v option on CLI or -h option (and possibly
others) on CGI is provided, there is a double free.
Fix it by nulling the pointers explicitly after preloading has finished
to fix it for all SAPIs.

Closes GH-12311.
 2023-10-02 19:33:41 +02:00
Niels Dossche
75441d71d8 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10964: Improve `man` page about the built-in server
  Fix GH-11438: mysqlnd fails to authenticate with sha256_password accounts using passwords longer than 19 characters
 2023-08-03 20:32:30 +02:00
Alexandre Daubois
997a36750b Fix GH-10964: Improve man page about the built-in server 
Closes GH-11857.
 2023-08-03 20:29:13 +02:00
Niels Dossche
272dc9a09c Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-11716: cli server crashes on SIGINT when compiled with ZEND_RC_DEBUG=1
 2023-07-21 15:31:20 +02:00
Niels Dossche
af77d3b8da Fix GH-11716: cli server crashes on SIGINT when compiled with ZEND_RC_DEBUG=1 
Closes GH-11757.
 2023-07-21 15:23:56 +02:00
Niels Dossche
4a28cc725a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-9669: phpdbg -h options doesn't list the -z option
 2023-07-07 19:17:35 +02:00
Adam Saponara
119b062169 Fix GH-9669: phpdbg -h options doesn't list the -z option 
Adds `-z` flag in phpdbg output.

Closes GH-9713.
 2023-07-07 19:16:32 +02:00
nielsdos
b9bf9ee2cb Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix interrupted CLI output causing the process to exit
 2023-06-23 17:42:45 +02:00
nielsdos
1111a9517b Fix interrupted CLI output causing the process to exit 
When writing the output in the CLI is interrupted by a signal, the
writing will fail in sapi_cli_single_write(), causing an exit later in
sapi_cli_ub_write(). This was the other part of the issue in GH-11498.
The solution is to restart the write if an EINTR has been observed.

Closes GH-11510.
 2023-06-23 17:39:04 +02:00
Jakub Zelenka
6877b4f110
Merge branch 'PHP-8.1' into PHP-8.2 2023-06-15 17:37:09 +01:00
Jakub Zelenka
9b18466396
FPM: Add "pcntl" when running another test depending on pcntl 2023-06-15 17:36:00 +01:00
Mikhail Galanin
7ade242e28
sapi/fpm: add "pcntl" when running test depending pcntl_sigprocmask() 
If "pcntl" is built as a shared module, the extension will not
load automatically when we spawn the FPM
 2023-06-15 17:32:02 +01:00
Ilija Tovilo
0bf8ecf9b3
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix bug GH-11246 cli/get_set_process_title
 2023-05-31 17:10:17 +02:00
James Lucas
c6ae7a55b7
Fix bug GH-11246 cli/get_set_process_title 
Fail to clobber_error only when the argv is a non-contiguous area
Don't increment the end_of_error if a non-contiguous area is encountered in environ

Closes GH-11247
 2023-05-31 17:08:37 +02:00
Jakub Zelenka
3769505c87
Merge branch 'PHP-8.1' into PHP-8.2 2023-05-19 16:30:36 +01:00
Jakub Zelenka
aa061cd40b
Fix FPM status json encoded value test 
Closes GH-11276
 2023-05-19 16:20:21 +01:00
Ilija Tovilo
69d41cc7fc
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Mark frequently failing fpm test as XFAIL
 2023-05-17 17:42:39 +02:00
Ilija Tovilo
e31fe111a5
[skip ci] Mark frequently failing fpm test as XFAIL 
Reported here: https://github.com/php/php-src/pull/11050#issuecomment-1546990346
 2023-05-17 17:42:05 +02:00
Jakub Zelenka
1129046482
Merge branch 'PHP-8.1' into PHP-8.2 2023-05-14 12:28:52 +01:00
Jakub Zelenka
4294e8d448
FPM: Fix memory leak for invalid primary script file handle 
Closes GH-11088
 2023-05-14 12:27:38 +01:00
Jakub Zelenka
90553af15c
Merge branch 'PHP-8.1' into PHP-8.2 2023-05-13 18:53:35 +01:00
Jakub Zelenka
5e64ead64a
Fix bug #64539: FPM status - query_string not properly JSON encoded 
Closes GH-11050
 2023-05-13 18:43:30 +01:00
Jakub Zelenka
bda28eb649
Merge branch 'PHP-8.1' into PHP-8.2 2023-05-13 14:14:23 +01:00
Jakub Zelenka
102953735c
Fix GH-10461: Postpone FPM child freeing in event loop 
This is to prevent after free accessing of the child event that might
happen when child is killed and the message is delivered at that same
time.

Also fixes GH-10889 and properly fixes GH-8517 that was not previously
fixed correctly.
 2023-05-13 14:11:42 +01:00
Jakub Zelenka
0b4f2fc9e8
Merge branch 'PHP-8.1' into PHP-8.2 2023-04-07 12:29:23 +01:00
Jakub Zelenka
ebb3213f79
Add FPM FCGI env Apache handler UDS test 2023-04-07 12:28:42 +01:00
Jakub Zelenka
1ca1858f31
Merge branch 'PHP-8.1' into PHP-8.2 2023-04-06 16:00:48 +01:00
Jakub Zelenka
15802dfc62 Add FPM FastCGI env var test for Apache without path info fix 2023-04-06 15:59:34 +01:00
Ilija Tovilo
9b15537e9a
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Unparallelize IO heavy tests
 2023-03-27 16:34:11 +02:00
Ilija Tovilo
e1ec67acd6
Unparallelize IO heavy tests 
Alternative to GH-10892. This is somewhat unfortunate since these are also the
slow tests. I'm also not sure if this actually helps.

Closes GH-10953
 2023-03-27 16:33:36 +02:00
Jakub Zelenka
2b0d29bf17
Merge branch 'PHP-8.1' into PHP-8.2 2023-03-19 13:17:09 +00:00
Jakub Zelenka
0d4d471847
Fix bug #74129: Incorrect SCRIPT_NAME with apache ProxyPassMatch 
This happens when there are spaces are in the path info. The reason is
that Apache decodes the path info part in the SCRIPT_NAME as per CGI
RFC. FPM tries to strip path info from the SCRIPT_NAME but the
comparison is done against SCRIPT_FILENAME which is not decoded. For
that to work we have to decode it before comparison if there is any
encoded character.

Closes GH-10869
 2023-03-19 13:11:14 +00:00
Niels Dossche
e44b1a916d Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Destroy file_handle in fpm_main
 2023-03-18 21:00:21 +01:00
Niels Dossche
f30e71cbde Destroy file_handle in fpm_main 
If it's not in the CG(open_files) list, we need to destroy the file
handle ourselves.

Co-authored-by: Jakub Zelenka <bukka@php.net>

Closes GH-10707.
 2023-03-18 20:54:46 +01:00
Jakub Zelenka
4ac12006ae
Merge branch 'PHP-8.1' into PHP-8.2 2023-03-17 14:56:45 +00:00
Jakub Zelenka
7d987ebbbf Fix FPM tester $scriptName logic 2023-03-17 14:55:51 +00:00
Jakub Zelenka
e9bbddcdaf
Merge branch 'PHP-8.1' into PHP-8.2 2023-03-17 10:45:14 +00:00
Jakub Zelenka
38d2e7ea9a
Test FPM FCGI envs with path info fix for Apache proxy pass 2023-03-17 10:42:16 +00:00