1 files changed, 129 insertions, 175 deletions

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index a6dca8c874..30bffbdd8c 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -29,13 +29,15 @@
 
 #include "ext/standard/info.h"
 #include "ext/standard/file.h"
+#include "Zend/zend_exceptions.h"
+#include "Zend/zend_interfaces.h"
 
 #include "php_ftp.h"
 #include "ftp.h"
 #include "ftp_arginfo.h"
 
-static int le_ftpbuf;
-#define le_ftpbuf_name "FTP Buffer"
+static zend_class_entry *php_ftp_ce = NULL;
+static zend_object_handlers ftp_object_handlers;
 
 zend_module_entry php_ftp_module_entry = {
 	STANDARD_MODULE_HEADER_EX,
@@ -56,15 +58,42 @@ zend_module_entry php_ftp_module_entry = {
 ZEND_GET_MODULE(php_ftp)
 #endif
 
-static void ftp_destructor_ftpbuf(zend_resource *rsrc)
-{
-	ftpbuf_t *ftp = (ftpbuf_t *)rsrc->ptr;
+typedef struct _php_ftp_object {
+	ftpbuf_t *ftp;
+	zend_object std;
+} php_ftp_object;
+
+static inline zend_object *ftp_object_to_zend_object(php_ftp_object *obj) {
+	return ((zend_object*)(obj + 1)) - 1;
+}
+
+static inline php_ftp_object *ftp_object_from_zend_object(zend_object *zobj) {
+	return ((php_ftp_object*)(zobj + 1)) - 1;
+}
+
+static zend_object* ftp_object_create(zend_class_entry* ce) {
+	php_ftp_object *obj = zend_object_alloc(sizeof(php_ftp_object), ce);
+	zend_object *zobj = ftp_object_to_zend_object(obj);
+	obj->ftp = NULL;
+	zend_object_std_init(zobj, ce);
+	object_properties_init(zobj, ce);
+	zobj->handlers = &ftp_object_handlers;
 
-	ftp_close(ftp);
+	return zobj;
+}
+
+static void ftp_object_destroy(zend_object *zobj) {
+	php_ftp_object *obj = ftp_object_from_zend_object(zobj);
+
+	if (obj->ftp) {
+		ftp_close(obj->ftp);
+	}
 }
 
 PHP_MINIT_FUNCTION(ftp)
 {
+	zend_class_entry ce;
+
 #ifdef HAVE_FTP_SSL
 #if OPENSSL_VERSION_NUMBER < 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
 	SSL_library_init();
@@ -76,7 +105,18 @@ PHP_MINIT_FUNCTION(ftp)
 #endif
 #endif
 
-	le_ftpbuf = zend_register_list_destructors_ex(ftp_destructor_ftpbuf, NULL, le_ftpbuf_name, module_number);
+	INIT_CLASS_ENTRY(ce, "FTPConnection", NULL);
+	php_ftp_ce = zend_register_internal_class(&ce);
+	php_ftp_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+	php_ftp_ce->create_object = ftp_object_create;
+	php_ftp_ce->serialize = zend_class_serialize_deny;
+	php_ftp_ce->unserialize = zend_class_unserialize_deny;
+
+	memcpy(&ftp_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
+	ftp_object_handlers.offset = XtOffsetOf(php_ftp_object, std);
+	ftp_object_handlers.dtor_obj = ftp_object_destroy;
+	ftp_object_handlers.clone_obj = NULL;
+
 	REGISTER_LONG_CONSTANT("FTP_ASCII",  FTPTYPE_ASCII, CONST_PERSISTENT | CONST_CS);
 	REGISTER_LONG_CONSTANT("FTP_TEXT",   FTPTYPE_ASCII, CONST_PERSISTENT | CONST_CS);
 	REGISTER_LONG_CONSTANT("FTP_BINARY", FTPTYPE_IMAGE, CONST_PERSISTENT | CONST_CS);
@@ -143,7 +183,8 @@ PHP_FUNCTION(ftp_connect)
 	ftp->use_ssl = 0;
 #endif
 
-	RETURN_RES(zend_register_resource(ftp, le_ftpbuf));
+	object_init_ex(return_value, php_ftp_ce);
+	ftp_object_from_zend_object(Z_OBJ_P(return_value))->ftp = ftp;
 }
 /* }}} */
 
@@ -177,11 +218,19 @@ PHP_FUNCTION(ftp_ssl_connect)
 	/* enable ssl */
 	ftp->use_ssl = 1;
 
-	RETURN_RES(zend_register_resource(ftp, le_ftpbuf));
+	object_init_ex(return_value, php_ftp_ce);
+	ftp_object_from_zend_object(Z_OBJ_P(return_value))->ftp = ftp;
 }
 /* }}} */
 #endif
 
+#define GET_FTPBUF(ftpbuf, zftp) \
+	ftpbuf = ftp_object_from_zend_object(Z_OBJ_P(zftp))->ftp; \
+	if (!ftpbuf) { \
+		zend_throw_exception(zend_ce_value_error, "FTPConnection is already closed", 0); \
+		RETURN_THROWS(); \
+	}
+
 /* {{{ Logs into the FTP server */
 PHP_FUNCTION(ftp_login)
 {
@@ -190,13 +239,10 @@ PHP_FUNCTION(ftp_login)
 	char *user, *pass;
 	size_t user_len, pass_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &z_ftp, &user, &user_len, &pass, &pass_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oss", &z_ftp, php_ftp_ce, &user, &user_len, &pass, &pass_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* log in */
 	if (!ftp_login(ftp, user, user_len, pass, pass_len)) {
@@ -215,13 +261,10 @@ PHP_FUNCTION(ftp_pwd)
 	ftpbuf_t	*ftp;
 	const char	*pwd;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_ftp, php_ftp_ce) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	if (!(pwd = ftp_pwd(ftp))) {
 		php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf);
@@ -238,13 +281,10 @@ PHP_FUNCTION(ftp_cdup)
 	zval 		*z_ftp;
 	ftpbuf_t	*ftp;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_ftp, php_ftp_ce) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	if (!ftp_cdup(ftp)) {
 		php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf);
@@ -263,13 +303,10 @@ PHP_FUNCTION(ftp_chdir)
 	char		*dir;
 	size_t			dir_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_ftp, php_ftp_ce, &dir, &dir_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* change directories */
 	if (!ftp_chdir(ftp, dir, dir_len)) {
@@ -289,13 +326,10 @@ PHP_FUNCTION(ftp_exec)
 	char		*cmd;
 	size_t			cmd_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_ftp, php_ftp_ce, &cmd, &cmd_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* execute serverside command */
 	if (!ftp_exec(ftp, cmd, cmd_len)) {
@@ -315,13 +349,10 @@ PHP_FUNCTION(ftp_raw)
 	char		*cmd;
 	size_t			cmd_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_ftp, php_ftp_ce, &cmd, &cmd_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* execute arbitrary ftp command */
 	ftp_raw(ftp, cmd, cmd_len, return_value);
@@ -337,13 +368,10 @@ PHP_FUNCTION(ftp_mkdir)
 	zend_string *tmp;
 	size_t		dir_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_ftp, php_ftp_ce, &dir, &dir_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* create directory */
 	if (NULL == (tmp = ftp_mkdir(ftp, dir, dir_len))) {
@@ -363,13 +391,10 @@ PHP_FUNCTION(ftp_rmdir)
 	char		*dir;
 	size_t		dir_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_ftp, php_ftp_ce, &dir, &dir_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* remove directorie */
 	if (!ftp_rmdir(ftp, dir, dir_len)) {
@@ -390,13 +415,10 @@ PHP_FUNCTION(ftp_chmod)
 	size_t		filename_len;
 	zend_long		mode;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlp", &z_ftp, &mode, &filename, &filename_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olp", &z_ftp, php_ftp_ce, &mode, &filename, &filename_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	if (!ftp_chmod(ftp, mode, filename, filename_len)) {
 		php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf);
@@ -415,13 +437,10 @@ PHP_FUNCTION(ftp_alloc)
 	zend_long		size, ret;
 	zend_string	*response = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|z", &z_ftp, &size, &zresponse) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol|z", &z_ftp, php_ftp_ce, &size, &zresponse) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	ret = ftp_alloc(ftp, size, zresponse ? &response : NULL);
 
@@ -445,13 +464,10 @@ PHP_FUNCTION(ftp_nlist)
 	char		**nlist, **ptr, *dir;
 	size_t		dir_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &dir, &dir_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &z_ftp, php_ftp_ce, &dir, &dir_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* get list of files */
 	if (NULL == (nlist = ftp_nlist(ftp, dir, dir_len))) {
@@ -475,13 +491,10 @@ PHP_FUNCTION(ftp_rawlist)
 	size_t		dir_len;
 	zend_bool	recursive = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|b", &z_ftp, &dir, &dir_len, &recursive) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|b", &z_ftp, php_ftp_ce, &dir, &dir_len, &recursive) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* get raw directory listing */
 	if (NULL == (llist = ftp_list(ftp, dir, dir_len, recursive))) {
@@ -505,13 +518,10 @@ PHP_FUNCTION(ftp_mlsd)
 	size_t		dir_len;
 	zval		entry;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_ftp, php_ftp_ce, &dir, &dir_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* get raw directory listing */
 	if (NULL == (llist = ftp_mlsd(ftp, dir, dir_len))) {
@@ -539,13 +549,10 @@ PHP_FUNCTION(ftp_systype)
 	ftpbuf_t	*ftp;
 	const char	*syst;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_ftp, php_ftp_ce) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	if (NULL == (syst = ftp_syst(ftp))) {
 		php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf);
@@ -567,13 +574,10 @@ PHP_FUNCTION(ftp_fget)
 	size_t		file_len;
 	zend_long		mode=FTPTYPE_IMAGE, resumepos=0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrs|ll", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ors|ll", &z_ftp, php_ftp_ce, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	php_stream_from_res(stream, Z_RES_P(z_file));
 	XTYPE(xtype, mode);
 
@@ -612,13 +616,10 @@ PHP_FUNCTION(ftp_nb_fget)
 	size_t		file_len;
 	zend_long		mode=FTPTYPE_IMAGE, resumepos=0, ret;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrs|ll", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ors|ll", &z_ftp, php_ftp_ce, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	php_stream_from_res(stream, Z_RES_P(z_file));
 	XTYPE(xtype, mode);
 
@@ -657,13 +658,10 @@ PHP_FUNCTION(ftp_pasv)
 	ftpbuf_t	*ftp;
 	zend_bool	pasv;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rb", &z_ftp, &pasv) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ob", &z_ftp, php_ftp_ce, &pasv) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	if (!ftp_pasv(ftp, pasv ? 1 : 0)) {
 		RETURN_FALSE;
@@ -684,13 +682,10 @@ PHP_FUNCTION(ftp_get)
 	size_t		local_len, remote_len;
 	zend_long		mode=FTPTYPE_IMAGE, resumepos=0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Opp|ll", &z_ftp, php_ftp_ce, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	XTYPE(xtype, mode);
 
 	/* ignore autoresume if autoseek is switched off */
@@ -749,13 +744,10 @@ PHP_FUNCTION(ftp_nb_get)
 	int ret;
 	zend_long		mode=FTPTYPE_IMAGE, resumepos=0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss|ll", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oss|ll", &z_ftp, php_ftp_ce, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	XTYPE(xtype, mode);
 
 	/* ignore autoresume if autoseek is switched off */
@@ -816,13 +808,10 @@ PHP_FUNCTION(ftp_nb_continue)
 	ftpbuf_t	*ftp;
 	zend_long		ret;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_ftp, php_ftp_ce) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	if (!ftp->nb) {
 		php_error_docref(NULL, E_WARNING, "No nbronous transfer to continue");
@@ -859,13 +848,10 @@ PHP_FUNCTION(ftp_fput)
 	php_stream	*stream;
 	char		*remote;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsr|ll", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Osr|ll", &z_ftp, php_ftp_ce, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	php_stream_from_zval(stream, z_file);
 	XTYPE(xtype, mode);
 
@@ -908,13 +894,10 @@ PHP_FUNCTION(ftp_nb_fput)
 	php_stream	*stream;
 	char		*remote;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsr|ll", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Osr|ll", &z_ftp, php_ftp_ce, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	php_stream_from_res(stream, Z_RES_P(z_file));
 	XTYPE(xtype, mode);
 
@@ -961,13 +944,10 @@ PHP_FUNCTION(ftp_put)
 	zend_long		mode=FTPTYPE_IMAGE, startpos=0;
 	php_stream 	*instream;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Opp|ll", &z_ftp, php_ftp_ce, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	XTYPE(xtype, mode);
 
 	if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ? "rt" : "rb", REPORT_ERRORS, NULL))) {
@@ -1014,13 +994,10 @@ PHP_FUNCTION(ftp_append)
 	zend_long		mode=FTPTYPE_IMAGE;
 	php_stream 	*instream;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Opp|l", &z_ftp, php_ftp_ce, &remote, &remote_len, &local, &local_len, &mode) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	XTYPE(xtype, mode);
 
 	if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ? "rt" : "rb", REPORT_ERRORS, NULL))) {
@@ -1049,13 +1026,10 @@ PHP_FUNCTION(ftp_nb_put)
 	zend_long		mode=FTPTYPE_IMAGE, startpos=0, ret;
 	php_stream 	*instream;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Opp|ll", &z_ftp, php_ftp_ce, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 	XTYPE(xtype, mode);
 
 	if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ? "rt" : "rb", REPORT_ERRORS, NULL))) {
@@ -1107,13 +1081,10 @@ PHP_FUNCTION(ftp_size)
 	char		*file;
 	size_t		file_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &file, &file_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &z_ftp, php_ftp_ce, &file, &file_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* get file size */
 	RETURN_LONG(ftp_size(ftp, file, file_len));
@@ -1128,13 +1099,10 @@ PHP_FUNCTION(ftp_mdtm)
 	char		*file;
 	size_t		file_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &file, &file_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &z_ftp, php_ftp_ce, &file, &file_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* get file mod time */
 	RETURN_LONG(ftp_mdtm(ftp, file, file_len));
@@ -1149,13 +1117,10 @@ PHP_FUNCTION(ftp_rename)
 	char		*src, *dest;
 	size_t		src_len, dest_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &z_ftp, &src, &src_len, &dest, &dest_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oss", &z_ftp, php_ftp_ce, &src, &src_len, &dest, &dest_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* rename the file */
 	if (!ftp_rename(ftp, src, src_len, dest, dest_len)) {
@@ -1175,13 +1140,10 @@ PHP_FUNCTION(ftp_delete)
 	char		*file;
 	size_t		file_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &file, &file_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_ftp, php_ftp_ce, &file, &file_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* delete the file */
 	if (!ftp_delete(ftp, file, file_len)) {
@@ -1201,13 +1163,10 @@ PHP_FUNCTION(ftp_site)
 	char		*cmd;
 	size_t		cmd_len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_ftp, php_ftp_ce, &cmd, &cmd_len) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	/* send the site command */
 	if (!ftp_site(ftp, cmd, cmd_len)) {
@@ -1223,18 +1182,19 @@ PHP_FUNCTION(ftp_site)
 PHP_FUNCTION(ftp_close)
 {
 	zval		*z_ftp;
-	ftpbuf_t	*ftp;
+	php_ftp_object *obj;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_ftp, php_ftp_ce) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
-		RETURN_THROWS();
+	obj = ftp_object_from_zend_object(Z_OBJ_P(z_ftp));
+	if (obj->ftp) {
+		ftp_quit(obj->ftp);
+		ftp_close(obj->ftp);
+		obj->ftp = NULL;
 	}
 
-	ftp_quit(ftp);
-
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1246,13 +1206,10 @@ PHP_FUNCTION(ftp_set_option)
 	zend_long		option;
 	ftpbuf_t	*ftp;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &z_ftp, &option, &z_value) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olz", &z_ftp, php_ftp_ce, &option, &z_value) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	switch (option) {
 		case PHP_FTP_OPT_TIMEOUT_SEC:
@@ -1298,13 +1255,10 @@ PHP_FUNCTION(ftp_get_option)
 	zend_long		option;
 	ftpbuf_t	*ftp;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &z_ftp, &option) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &z_ftp, php_ftp_ce, &option) == FAILURE) {
 		RETURN_THROWS();
 	}
+	GET_FTPBUF(ftp, z_ftp);
 
 	switch (option) {
 		case PHP_FTP_OPT_TIMEOUT_SEC: