Skip to content

[pull] master from php:master #1151

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 5 commits into from
Oct 26, 2025
Merged

[pull] master from php:master #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d0499a
Don't duplicate protoname for stream wrappers (#20292)
ndossche Oct 26, 2025
61b0d58
ftp: Fix weird typo (#20295)
ndossche Oct 26, 2025
d403036
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 26, 2025
393302b
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Oct 26, 2025
23674d9
Merge branch 'PHP-8.5'
ndossche Oct 26, 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
4 changes: 2 additions & 2 deletions ext/ftp/php_ftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ PHP_FUNCTION(ftp_nb_get)
}
/* }}} */

/* {{{ Continues retrieving/sending a file nbronously */
/* {{{ Continues to retrieve or send a file in non-blocking mode */
PHP_FUNCTION(ftp_nb_continue)
{
zval *z_ftp;
Expand All @@ -828,7 +828,7 @@ PHP_FUNCTION(ftp_nb_continue)
GET_FTPBUF(ftp, z_ftp);

if (!ftp->nb) {
php_error_docref(NULL, E_WARNING, "No nbronous transfer to continue");
php_error_docref(NULL, E_WARNING, "No non-blocking transfer to continue");
RETURN_LONG(PHP_FTP_FAILED);
}

Expand Down
2 changes: 1 addition & 1 deletion ext/ftp/tests/005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ int(-1)
Warning: ftp_mkdir(): Command not implemented (7). in %s005.php on line %d
bool(false)

Warning: ftp_nb_continue(): No nbronous transfer to continue in %s005.php on line %d
Warning: ftp_nb_continue(): No non-blocking transfer to continue in %s on line %d
int(0)
ftp_nb_fget(): Argument #4 ($mode) must be either FTP_ASCII or FTP_BINARY
ftp_nb_fput(): Argument #4 ($mode) must be either FTP_ASCII or FTP_BINARY
Expand Down
3 changes: 0 additions & 3 deletions main/streams/userspace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ static int le_protocols;

struct php_user_stream_wrapper {
php_stream_wrapper wrapper;
char * protoname;
zend_class_entry *ce;
zend_resource *resource;
};
Expand Down Expand Up @@ -72,7 +71,6 @@ static void stream_wrapper_dtor(zend_resource *rsrc)
{
struct php_user_stream_wrapper * uwrap = (struct php_user_stream_wrapper*)rsrc->ptr;

efree(uwrap->protoname);
efree(uwrap);
}

Expand Down Expand Up @@ -468,7 +466,6 @@ PHP_FUNCTION(stream_wrapper_register)

uwrap = (struct php_user_stream_wrapper *)ecalloc(1, sizeof(*uwrap));
uwrap->ce = ce;
uwrap->protoname = estrndup(ZSTR_VAL(protocol), ZSTR_LEN(protocol));
uwrap->wrapper.wops = &user_stream_wops;
uwrap->wrapper.abstract = uwrap;
uwrap->wrapper.is_url = ((flags & PHP_STREAM_IS_URL) != 0);
Expand Down