Skip to content

[pull] master from php:master #1122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 15, 2025
Merged

[pull] master from php:master #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d36109b
ext/phar: use size_t type instead of int
Girgias Oct 13, 2025
2c51420
Merge branch 'PHP-8.3' into PHP-8.4
Girgias Oct 15, 2025
2bdc745
Merge branch 'PHP-8.4' into PHP-8.5
Girgias Oct 15, 2025
6df26b9
Merge branch 'PHP-8.5'
Girgias Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/phar/phar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias,
}
/* }}}*/

static inline char *phar_strnstr(const char *buf, int buf_len, const char *search, int search_len) /* {{{ */
static inline char *phar_strnstr(const char *buf, size_t buf_len, const char *search, size_t search_len) /* {{{ */
{
const char *c;
ptrdiff_t so_far = 0;
Expand Down
2 changes: 1 addition & 1 deletion ext/phar/stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
{
php_url *resource;
char *internal_file, *error;
int internal_file_len;
size_t internal_file_len;
phar_entry_data *idata;
phar_archive_data *pphar;

Expand Down