Skip to content

Commit 118acef

Browse files
Mai-Lapystlangemeijer
authored andcommitted
Fix sftp streamwrapper not correctly handeling freestanding urls; fixes #85
1 parent a0621be commit 118acef

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

ssh2_fopen_wrappers.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,8 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
501501
session_authed:
502502
ZVAL_RES(&zsession, zend_register_resource(session, le_ssh2_session));
503503

504-
if (psftp) {
504+
if (psftp && psftp_rsrc) {
505505
LIBSSH2_SFTP *sftp;
506-
zval zsftp;
507506

508507
sftp = libssh2_sftp_init(session);
509508
if (!sftp) {
@@ -516,10 +515,8 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
516515
sftp_data->session = session;
517516
sftp_data->sftp = sftp;
518517
sftp_data->session_rsrc = Z_RES(zsession);
519-
520-
//TODO Sean-Der
521-
//ZEND_REGISTER_RESOURCE(sftp_data, le_ssh2_sftp);
522-
*psftp_rsrc = Z_RES(zsftp);
518+
Z_ADDREF(zsession);
519+
*psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp);
523520
*psftp = sftp;
524521
}
525522

0 commit comments

Comments
 (0)