php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
134,943 Commits 549 Branches 1,486 Tags
fpm_kqueue_simpl
Commit Graph

581 Commits

Author SHA1 Message Date
David CARLIER 9726721560 general signatures discrepencies fixes (#13122) 2024-01-10 22:19:23 +00:00
Niels Dossche 0a3b891ba1 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12721: SplFileInfo::getFilename() segfault in combination with GlobIterator and no directory separator
 2023-11-19 11:52:58 +01:00
Niels Dossche 4d41dffb4f Fix GH-12721: SplFileInfo::getFilename() segfault in combination with GlobIterator and no directory separator 
This broke in 7cd8879 and 9bae9ab. NULL is a perfectly valid return
value that should be handled.

Closes GH-12722.
 2023-11-19 11:52:27 +01:00
Niels Dossche 0b2e6bc2b0 Cache d_type in directory entry 2023-07-07 18:02:32 +02:00
Niels Dossche 1fbbd2b250 Remove unused is_recursive entry 
This only takes up space and time.
 2023-07-07 18:02:17 +02:00
nielsdos 1ed68686de Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix DOMElement::append() and DOMElement::prepend() hierarchy checks
  Fix spec compliance error for DOMDocument::getElementsByTagNameNS
  Fix GH-11336: php still tries to unlock the shared memory ZendSem with opcache.file_cache_only=1 but it was never locked
  Fix GH-11338: SplFileInfo empty getBasename with more than one slash
 2023-05-30 17:41:54 +02:00
nielsdos 0e7ad40900 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix DOMElement::append() and DOMElement::prepend() hierarchy checks
  Fix spec compliance error for DOMDocument::getElementsByTagNameNS
  Fix GH-11336: php still tries to unlock the shared memory ZendSem with opcache.file_cache_only=1 but it was never locked
  Fix GH-11338: SplFileInfo empty getBasename with more than one slash
 2023-05-30 17:38:18 +02:00
Niels Dossche bce536067c Fix GH-11338: SplFileInfo empty getBasename with more than one slash 
Regressed in 13e4ce386b.

Closes GH-11340.
 2023-05-30 17:29:18 +02:00
Ilija Tovilo 9d5f2f1343 Use new ZSTR_INIT_LITERAL macro (#10879) 2023-03-20 16:19:05 +01:00
Marcos Marcolin 9004725367 chore: standardize the visibility of functions. (#10708) 
Co-authored-by: Marcos Marcolin <marcos@ixcsoft.com.br>
 2023-02-26 14:08:33 +00:00
Máté Kocsis 7936c8085e Fix GH-8329 Print true/false instead of bool in error and debug messages (#8385) 2023-01-23 10:52:14 +01:00
Christoph M. Becker c8955c078a Revert GH-10220 
Cf. <https://github.com/php/php-src/pull/10220#issuecomment-1383739816>.

This reverts commit ecc880f491.
This reverts commit 588a07f737.
This reverts commit f377e15751.
This reverts commit b4ba16fe18.
This reverts commit 694ec1deea.
This reverts commit 6b34de8eba.
This reverts commit aa1cd02a43.
This reverts commit 308fd311ea.
This reverts commit 16203b53e1.
This reverts commit 738fb5ca54.
This reverts commit 9fdbefacd3.
This reverts commit cd4a7c1d90.
This reverts commit 928685eba2.
This reverts commit 01e5ffc85c.
 2023-01-16 12:27:33 +01:00
Max Kellermann 308fd311ea ext/{standard,json,random,...}: add missing includes 2023-01-10 14:19:03 +00:00
George Peter Banyard b97d2b6dae Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-9883  SplFileObject::__toString() reads next line
 2022-11-22 12:26:48 +00:00
George Peter Banyard 6e87485d3c Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-9883  SplFileObject::__toString() reads next line
 2022-11-22 12:26:03 +00:00
George Peter Banyard 6fbf81c674 Fix GH-9883 SplFileObject::__toString() reads next line 
We need to overwrite the __toString magic method for SplFileObject, similarly to how DirectoryIterator overwrites it
Moreover, the custom cast handler is useless as we define __toString methods, so use the standard one instead.

Closes GH-9912
 2022-11-22 12:21:14 +00:00
Bob Weinand a01dd9feda Revert "Port all internally used classes to use default_object_handlers" 
This reverts commit 94ee4f9834.

The commit was a bit too late to be included in PHP 8.2 RC1. Given it's a massive ABI break, we decide to postpone the change to PHP 8.3.
 2022-09-14 11:13:23 +02:00
Bob Weinand 94ee4f9834 Port all internally used classes to use default_object_handlers 
Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
 2022-08-31 16:45:27 +02:00
Máté Kocsis b73f139c70 Declare ext/spl constants in stubs (#9226) 2022-08-02 16:37:12 +02:00
George Peter Banyard 1478278f1d SPL: Use new improved is_line_empty() function instead of the old one (#9217) 2022-08-01 17:55:30 +01:00
George Peter Banyard 7ab22aad9e Refactor code handling file.current_zval (#8934) 
The Zval is always an array
 2022-07-28 19:36:30 +01:00
Christoph M. Becker 5d52d472ef Fix #69181: READ_CSV|DROP_NEW_LINE drops newlines within fields 
One may argue that `DROP_NEW_LINE` does not make sense in combination
with `READ_CSV`, but without `DROP_NEW_LINE`, `SKIP_EMPTY` does not
skip empty lines at all.  We could fix that, but do not for BC reasons.
Instead we no longer drop newlines in `spl_filesystem_file_read_ex()`
when reading CSV, but handle that in `spl_filesystem_file_read_csv()`
by treating lines with only (CR)LF as being empty as well.

Closes GH-7618.
 2022-07-26 18:33:57 +02:00
George Peter Banyard 4ccf0b0181 Make php_fgetcsv() return a HashTale instead of in-out zval param (#8936) 
Also refactor what happens on an empty line to return NULL instead of setting the array to [NULL] which makes no design sense at all.
However, as this is the current behaviour create a BC Shim inline function to recreate this weird HashTable in the functions which currently use this API
 2022-07-08 12:11:05 +01:00
George Peter Banyard 247de8a4de Use true/false and comment when arg correspond to silent arg 2022-07-08 11:36:59 +01:00
George Peter Banyard bb3d0933af Remove silent argument to spl_filesystem_file_read_line_ex() 
true was always passed to it
 2022-07-08 11:36:59 +01:00
George Peter Banyard a055c54801 Remove silent argument to spl_filesystem_file_read_line() 
true was always passed to it
 2022-07-08 11:36:59 +01:00
George Peter Banyard 6f26102bbf Merge branch 'PHP-8.1' 
* PHP-8.1:
  Revert "Fix GH-8563  Different results for seek() on SplFileObject and SplTempFileObject"
  Revert "Update FreeBSD CI image."
 2022-07-05 21:45:13 +01:00
George Peter Banyard e67336f46a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Revert "Fix GH-8563  Different results for seek() on SplFileObject and SplTempFileObject"
 2022-07-05 21:33:47 +01:00
George Peter Banyard 79a283240e Revert "Fix GH-8563 Different results for seek() on SplFileObject and SplTempFileObject" 
Although the fix is partially correct it also breaks long standing behaviour which has been produced since PHP 5.3.

This reverts commit 6f87a5c633.
 2022-07-05 21:28:59 +01:00
George Peter Banyard 9bae9ab3a4 Fix GH-8861: correctly handle string lengths in SplFileinfo methods (#8869) 
* Fix GH-8861: correctly handle string lengths in \SplFileinfo::getBasename

Co-authored-by: M. Vondano <m-vo@users.noreply.github.com>
 2022-06-28 15:42:59 +01:00
Ilija Tovilo 3b92a96610 Convert return type of various object handlers from int to zend_result (#8755) 2022-06-26 01:00:19 +02:00
George Peter Banyard 20638dba3f Use the passed 'this' pointer instead of ZEND_THIS (#8854) 
Removes the horrible hack usage of defining execute_data to be able to use ZEND_THING
 2022-06-24 03:38:29 +01:00
George Peter Banyard 7cd8879d77 Refactor spl_filesystem_object_get_path() to return zend_string* 2022-06-23 14:41:24 +01:00
George Peter Banyard 623fbfe748 Remove Z_SPLFILESYSTEM_P macro 
Remove one level of macro expansion hell
 2022-06-23 14:41:24 +01:00
George Peter Banyard 4d43241e96 Move some private SPL Directory elements out of the header 2022-06-23 14:41:24 +01:00
George Peter Banyard d5d0b07b4e Early return in spl_filesystem_file_rewind() 2022-06-20 17:27:35 +01:00
George Peter Banyard a493c94471 Use bool for silent parameter in SPL directory.c 2022-06-20 17:27:25 +01:00
cmp 6bd0175173 Prevent fclose on underlying SplFileObject file stream. (#7920) 2022-06-20 13:37:59 +01:00
George Peter Banyard 8c50b8d797 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix GH-8563  Different results for seek() on SplFileObject and SplTempFileObject
 2022-06-20 12:53:26 +01:00
George Peter Banyard 080fde2605 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-8563  Different results for seek() on SplFileObject and SplTempFileObject
 2022-06-20 12:53:01 +01:00
George Peter Banyard 6f87a5c633 Fix GH-8563 Different results for seek() on SplFileObject and SplTempFileObject 
With memory streams if we get a NULL buffer we must not instantiate an empty line
 2022-06-20 12:47:37 +01:00
George Peter Banyard dbf1cafd77 Remove internal usage of SplFileInfo::_bad_state_ex() method (#8318) 
* Use standard VM handling instead
 * Deprecate the method as it is now useless
 2022-06-09 13:24:58 +01:00
George Peter Banyard cf51d8ffe7 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix GH-8273: SplFileObject: key() returns wrong value
 2022-04-23 14:02:01 +01:00
George Peter Banyard 660ef91fbc Fix GH-8273: SplFileObject: key() returns wrong value 2022-04-23 14:00:11 +01:00
George Peter Banyard 6186ecd436 Fix GH-8273: SplFileObject: key() returns wrong value 2022-04-23 13:56:38 +01:00
George Peter Banyard 2ac5948f5c Refactor SplFileObject CSV methods (#8317) 
Use early returns, which fixes ValueError order of arguments and flattens the code
 2022-04-08 20:16:26 +01:00
George Peter Banyard 3931d726c4 Add missing ZPP checks in SPL Directory (#8325) 
Co-authored-by: Máté Kocsis <kocsismate@woohoolabs.com>
 2022-04-08 17:58:10 +01:00
George Peter Banyard 892270608c Minor refactoring of spl_directory.c 
Using more appropriate types
Fix comments
Early returns
 2022-04-07 15:12:40 +01:00
Max Kellermann b9e895bca0 Replace memcmp() with zend_string functions (#8216) 
* ext/oci8: use zend_string_equals()

Eliminate duplicate code.

* main/php_variables: use zend_string_equals_literal()

Eliminate duplicate code.

* Zend/zend_string: add zend_string_equals_cstr()

Allows eliminating duplicate code.

* Zend, ext/{opcache,standard}, main/output: use zend_string_equals_cstr()

Eliminate duplicate code.

* Zend/zend_string: add zend_string_starts_with()

* ext/{opcache,phar,spl,standard}: use zend_string_starts_with()

This adds missing length checks to several callers, e.g. in
cache_script_in_shared_memory().  This is important when the
zend_string is shorter than the string parameter, when memcmp()
happens to check backwards; this can result in an out-of-bounds memory
access.
 2022-03-31 16:27:58 +02:00
Christoph M. Becker 634b2141de Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix GH-8121: SplFileObject - seek and key with csv file inconsistent
 2022-03-08 16:59:19 +01:00