Christoph M. Becker
c8955c078a
Revert GH-10220
...
Cf. <https://github.com/php/php-src/pull/10220#issuecomment-1383739816 >.
This reverts commit ecc880f491588a07f737f377e15751b4ba16fe18694ec1deea6b34de8ebaaa1cd02a43308fd311ea16203b53e1738fb5ca549fdbefacd3cd4a7c1d90928685eba201e5ffc85c
2023-01-16 12:27:33 +01:00
Christoph M. Becker
2f4973fd88
Revert GH-10279
...
Cf. <https://github.com/php/php-src/pull/10220#issuecomment-1383739816 >.
This reverts commit 45a128c9de1eb71c3f15492523a779c7a4633891308adb915ccd27d5e07fc5933409b446371f4eb3623e2e9fc6e7434c1247d28d323ca21a067b84eea55c0c5fc3b5aeb3a4d4f061a035e4b088575119b1d48774a794f9a20ce64831e48708cd985de1909521d21681d6136151e9
2023-01-16 12:25:59 +01:00
Christoph M. Becker
bf1cfc0753
Revert GH-10300
...
Cf. <https://github.com/php/php-src/pull/10220#issuecomment-1383739816 >.
This reverts commit 68ada76f9a45384c6e20ef7fbfd7109b9ea0d7c6f15747c26be883ba93c47e87551c37921274d2b8fc1f528e5e0961715cdaa93f26452672dd94e1c629b2dc896405c7653bba5190e5c2606b55bf228c184b4a12d34c31b7888ad44e9680f04069a5c43f
2023-01-16 12:22:54 +01:00
Max Kellermann
184b4a12d3
main/php.h: add missing includes
2023-01-15 15:07:58 +00:00
Tim Düsterhus
4c9ae81c28
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Fix comment for php_safe_bcmp (#10306 )
2023-01-12 23:31:08 +01:00
Tim Düsterhus
fd7214436a
Fix comment for php_safe_bcmp ( #10306 )
...
* main: Fix comment for php_safe_bcmp
* main: Include note about php_safe_bcmp being security sensitive
This is taken from the implementation of `hash_equals()`.
2023-01-12 23:30:36 +01:00
Max Kellermann
9521d21681
main/php_globals.h: add missing include for PHPAPI
2023-01-12 15:12:45 +00:00
Max Kellermann
16203b53e1
main: add missing includes
2023-01-10 14:19:03 +00:00
Max Kellermann
9fdbefacd3
main/s[np]printf: include cleanup
2023-01-10 14:19:03 +00:00
Max Kellermann
d53ad4b566
main/SAPI: make "ini_entries" a const string
2023-01-04 12:49:48 +00:00
Pierrick Charron
002d54db9f
PHP-8.2 is now for PHP 8.2.2-dev
2022-12-13 19:29:29 -05:00
Elan Ruusamäe
e114f32596
Avoid code duplication in php_ini.c ( #4512 )
2022-12-10 12:51:13 +01:00
Jorg Adam Sowa
77ee92a50c
Remove unnecessary usage of CONST_CS
...
Closes GH-9685.
2022-11-28 17:12:07 +01:00
Pierrick Charron
44d652c00a
PHP-8.2 is now for PHP 8.2.1-dev and prepare NEWS for 8.2.0
2022-11-08 13:26:35 -05:00
Ilija Tovilo
51a99456e2
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Remove unnecessary ast eval bailout
2022-10-27 10:56:04 +02:00
Ilija Tovilo
1d6b32f65c
Remove unnecessary ast eval bailout
...
We can just reset the filename_override to NULL in php_request_shutdown.
Closes GH-9805
2022-10-27 10:54:59 +02:00
Jakub Zelenka
b8d013a48d
Merge branch 'PHP-8.2'
2022-10-23 12:41:51 +01:00
Jakub Zelenka
b732d80329
Fix bug GH-9779: stream_copy_to_stream fail when dest in append mode
2022-10-23 12:40:22 +01:00
Arnaud Le Blanc
77eadc5c9f
Merge branch 'PHP-8.2'
...
* PHP-8.2:
[ci skip] NEWS
[ci skip] NEWS
[ci skip] NEWS
Fix compilation warning
Fix crash when memory limit is exceeded during generator initialization
2022-10-22 10:45:21 +02:00
Arnaud Le Blanc
cfd5fb98e4
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
[ci skip] NEWS
[ci skip] NEWS
Fix compilation warning
Fix crash when memory limit is exceeded during generator initialization
2022-10-22 10:44:55 +02:00
Arnaud Le Blanc
ebe58459aa
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
[ci skip] NEWS
Fix compilation warning
Fix crash when memory limit is exceeded during generator initialization
2022-10-22 10:44:06 +02:00
Benoit
994097093c
Fix compilation warning
2022-10-22 10:41:02 +02:00
George Peter Banyard
a1953d5b29
Drop usage of confusing zend_fcall_info_call() API
...
The last parameter which is named zval *args, does NOT set the FCI params field. It is expected to be a PHP array which gets looped over to set the arguments which is also a zval pointer...
Since PHP 8.0, the named_params field is a more appropriate way of doing this.
2022-10-21 18:31:40 +01:00
Jakub Zelenka
18fe337bae
Fix bug #51056 : fread() on blocking stream will block even if data is available
...
This is applied only on socket connection which already returns
immediately if there is no data in the buffer.
2022-10-16 12:17:47 +01:00
Máté Kocsis
66f3b5ffb2
Declare main constants in stubs - part 3 ( #9731 )
2022-10-12 14:42:22 +02:00
Ben Ramsey
865161af33
PHP-8.1 is now for PHP 8.1.13-dev
2022-10-11 19:47:00 -04:00
Máté Kocsis
d90ecb9582
Declare main constants in stubs - part 2 ( #9714 )
2022-10-11 13:48:52 +02:00
Arnaud Le Blanc
5b6f9df51a
Merge branch 'PHP-8.2'
...
* PHP-8.2:
[ci skip] NEWS
[ci skip] NEWS
[ci skip] NEWS
Return immediately when FD_SETSIZE is exceeded (#9602 )
2022-10-01 11:26:17 +02:00
Arnaud Le Blanc
246d13cd99
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
[ci skip] NEWS
[ci skip] NEWS
Return immediately when FD_SETSIZE is exceeded (#9602 )
2022-10-01 11:24:23 +02:00
Arnaud Le Blanc
d4b99542d5
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
[ci skip] NEWS
Return immediately when FD_SETSIZE is exceeded (#9602 )
2022-10-01 11:23:34 +02:00
Arnaud Le Blanc
80232de0e4
Return immediately when FD_SETSIZE is exceeded ( #9602 )
2022-10-01 11:20:43 +02:00
Máté Kocsis
93982b144d
Declare main constants in stubs - part 1 ( #9616 )
2022-09-30 13:49:59 +02:00
Jakub Zelenka
d2288ec5ed
Clarify memory usage and slightly improve sapi_read_post_data
...
This is a result of checking GH-8800 which assumed potential
memory leaks here. Even though it was not the case in reality,
the function deserves a bit of clarification to prevent similar
attempts in the future.
2022-09-30 11:54:41 +01:00
Ilija Tovilo
138fd5b3c8
Replace reallocarray with safe_perealloc
...
Fixes GH-9581
2022-09-29 15:15:40 +02:00
Derick Rethans
01677cafae
Merge branch 'PHP-8.2'
2022-09-27 14:11:47 +01:00
Derick Rethans
25290cd25c
Merge branch 'PHP-8.1' into PHP-8.2
2022-09-27 14:11:40 +01:00
Derick Rethans
cfee252a95
Merge branch 'PHP-8.0' into PHP-8.1
2022-09-27 14:11:31 +01:00
Derick Rethans
def8c8d174
Merge branch 'PHP-7.4' into PHP-8.0
2022-09-27 14:11:14 +01:00
Ilija Tovilo
b61c81c949
Replace reallocarray with safe_perealloc ( #9593 )
2022-09-22 14:55:41 +02:00
Sara Golemon
559da529a0
Bump for 8.0.25
2022-09-13 23:46:26 +00:00
Patrick Allaert
0f575aa698
PHP-8.1 is now for PHP 8.1.12-dev
2022-09-13 23:09:47 +02:00
Dmitry Stogov
72fec0bbf3
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Reset FG(user_stream_current_filename) at the end of request
2022-09-12 11:39:36 +03:00
Dmitry Stogov
d64aa6f646
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Reset FG(user_stream_current_filename) at the end of request
2022-09-12 11:39:27 +03:00
Dmitry Stogov
f4afa9adc6
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Reset FG(user_stream_current_filename) at the end of request
2022-09-12 11:39:18 +03:00
Dmitry Stogov
d0b3096ff0
Reset FG(user_stream_current_filename) at the end of request
...
Attempt to fix oss-fuzz #51047
2022-09-12 11:38:31 +03:00
Derick Rethans
0611be4e82
Fix #81727 : Don't mangle HTTP variable names that clash with ones that have a specific semantic meaning.
2022-09-09 17:10:04 +01:00
Pierrick Charron
58a92772ab
Prepare PHP 8.2.0 RC1
2022-08-30 11:57:05 -04:00
Pierrick Charron
327c95237c
Prepare for PHP 8.3
2022-08-30 11:17:15 -04:00
Sara Golemon
3d6ed8c852
Catch up dev version numbers
2022-08-30 12:15:27 +00:00
Jakub Zelenka
f3c357c446
Merge branch 'PHP-8.1'
2022-08-29 22:34:48 +01:00
