first shot remove TSRMLS_* things

1 files changed, 172 insertions, 182 deletions

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 8dc56c5223..2c358375cf 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -74,10 +74,10 @@ MAILSTREAM DEFAULTPROTO;
 # define PHP_IMAP_EXPORT
 #endif
 
-static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
-static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
-static zend_string* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress TSRMLS_DC);
-static zend_string* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC);
+static void _php_make_header_object(zval *myzvalue, ENVELOPE *en);
+static void _php_imap_add_body(zval *arg, BODY *body);
+static zend_string* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress);
+static zend_string* _php_rfc822_write_address(ADDRESS *addresslist);
 
 /* the gets we use */
 static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DATA *md);
@@ -592,13 +592,13 @@ static int le_imap;
 
 #define PHP_IMAP_CHECK_MSGNO(msgindex)	\
 	if ((msgindex < 1) || ((unsigned) msgindex > imap_le_struct->imap_stream->nmsgs)) {	\
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad message number");	\
+		php_error_docref(NULL, E_WARNING, "Bad message number");	\
 		RETURN_FALSE;	\
 	}	\
 
 /* {{{ mail_close_it
  */
-static void mail_close_it(zend_resource *rsrc TSRMLS_DC)
+static void mail_close_it(zend_resource *rsrc)
 {
 	pils *imap_le_struct = (pils *)rsrc->ptr;
 
@@ -622,7 +622,7 @@ static void mail_close_it(zend_resource *rsrc TSRMLS_DC)
 
 /* {{{ add_assoc_object
  */
-static zval *add_assoc_object(zval *arg, char *key, zval *tmp TSRMLS_DC)
+static zval *add_assoc_object(zval *arg, char *key, zval *tmp)
 {
 	HashTable *symtable;
 
@@ -637,7 +637,7 @@ static zval *add_assoc_object(zval *arg, char *key, zval *tmp TSRMLS_DC)
 
 /* {{{ add_next_index_object
  */
-static inline zval *add_next_index_object(zval *arg, zval *tmp TSRMLS_DC)
+static inline zval *add_next_index_object(zval *arg, zval *tmp)
 {
 	HashTable *symtable;
 
@@ -760,7 +760,6 @@ void mail_free_messagelist(MESSAGELIST **msglist, MESSAGELIST **tail)
 void mail_getquota(MAILSTREAM *stream, char *qroot, QUOTALIST *qlist)
 {
 	zval t_map, *return_value;
-	TSRMLS_FETCH();
 
 	return_value = *IMAPG(quota_return);
 
@@ -788,7 +787,6 @@ void mail_getquota(MAILSTREAM *stream, char *qroot, QUOTALIST *qlist)
  */
 void mail_getacl(MAILSTREAM *stream, char *mailbox, ACLLIST *alist)
 {
-	TSRMLS_FETCH();
 
 	/* walk through the ACLLIST */
 	for(; alist; alist = alist->next) {
@@ -1079,7 +1077,7 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 		if (EG(error_reporting) & E_NOTICE) {
 			ecur = IMAPG(imap_errorstack);
 			while (ecur != NIL) {
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s (errflg=%ld)", ecur->LTEXT, ecur->errflg);
+				php_error_docref(NULL, E_NOTICE, "%s (errflg=%ld)", ecur->LTEXT, ecur->errflg);
 				ecur = ecur->next;
 			}
 		}
@@ -1091,7 +1089,7 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 		if (EG(error_reporting) & E_NOTICE) {
 			acur = IMAPG(imap_alertstack);
 			while (acur != NIL) {
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", acur->LTEXT);
+				php_error_docref(NULL, E_NOTICE, "%s", acur->LTEXT);
 				acur = acur->next;
 			}
 		}
@@ -1152,7 +1150,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	zval *params = NULL;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "pss|lla", &mailbox, &mailbox_len, &user, &user_len,
+	if (zend_parse_parameters(argc, "pss|lla", &mailbox, &mailbox_len, &user, &user_len,
 		&passwd, &passwd_len, &flags, &retries, &params) == FAILURE) {
 		return;
 	}
@@ -1193,7 +1191,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 										mail_parameters(NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_P(z_auth_method));
 									}
 								} else {
-									php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument, expect string or array of strings");
+									php_error_docref(NULL, E_WARNING, "Invalid argument, expect string or array of strings");
 								}
 							}
 						}
@@ -1201,7 +1199,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 					break;
 				case IS_LONG:
 				default:
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument, expect string or array of strings");
+					php_error_docref(NULL, E_WARNING, "Invalid argument, expect string or array of strings");
 					break;
 			}
 		}
@@ -1218,7 +1216,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	}
 
 	/* local filename, need to perform open_basedir check */
-	if (mailbox[0] != '{' && php_check_open_basedir(mailbox TSRMLS_CC)) {
+	if (mailbox[0] != '{' && php_check_open_basedir(mailbox)) {
 		RETURN_FALSE;
 	}
 
@@ -1228,7 +1226,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 #ifdef SET_MAXLOGINTRIALS
 	if (argc >= 5) {
 		if (retries < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING ,"Retries must be greater or equal to 0");
+			php_error_docref(NULL, E_WARNING ,"Retries must be greater or equal to 0");
 		} else {
 			mail_parameters(NIL, SET_MAXLOGINTRIALS, (void *) retries);
 		}
@@ -1238,7 +1236,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	imap_stream = mail_open(NIL, mailbox, flags);
 
 	if (imap_stream == NIL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't open stream %s", mailbox);
+		php_error_docref(NULL, E_WARNING, "Couldn't open stream %s", mailbox);
 		efree(IMAPG(imap_user)); IMAPG(imap_user) = 0;
 		efree(IMAPG(imap_password)); IMAPG(imap_password) = 0;
 		RETURN_FALSE;
@@ -1272,7 +1270,7 @@ PHP_FUNCTION(imap_reopen)
 	long flags=NIL;
 	long cl_flags=NIL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|ll", &streamind, &mailbox, &mailbox_len, &options, &retries) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|ll", &streamind, &mailbox, &mailbox_len, &options, &retries) == FAILURE) {
 		return;
 	}
 
@@ -1292,14 +1290,14 @@ PHP_FUNCTION(imap_reopen)
 	}
 #endif
 	/* local filename, need to perform open_basedir check */
-	if (mailbox[0] != '{' && php_check_open_basedir(mailbox TSRMLS_CC)) {
+	if (mailbox[0] != '{' && php_check_open_basedir(mailbox)) {
 		RETURN_FALSE;
 	}
 
 	imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags);
 	if (imap_le_struct->imap_stream == NIL) {
 		zend_list_delete(Z_RES_P(streamind));
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-open stream");
+		php_error_docref(NULL, E_WARNING, "Couldn't re-open stream");
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1322,7 +1320,7 @@ PHP_FUNCTION(imap_append)
 	long start_offset = 0;				/* Start offset (not used) */
 	int global = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|ss", &streamind, &folder, &folder_len, &message, &message_len, &flags, &flags_len, &internal_date, &internal_date_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss|ss", &streamind, &folder, &folder_len, &message, &message_len, &flags, &flags_len, &internal_date, &internal_date_len) == FAILURE) {
 		return;
 	}
 
@@ -1330,17 +1328,17 @@ PHP_FUNCTION(imap_append)
 
 	if (internal_date) {
 		/* Make sure the given internal_date string matches the RFC specifiedformat */
-		if ((pce = pcre_get_compiled_regex_cache(regex TSRMLS_CC))== NULL) {
+		if ((pce = pcre_get_compiled_regex_cache(regex))== NULL) {
 			zend_string_free(regex);
 			RETURN_FALSE;
 		}
 
 		zend_string_free(regex);
 		php_pcre_match_impl(pce, internal_date, internal_date_len, return_value, subpats, global,
-			0, regex_flags, start_offset TSRMLS_CC);
+			0, regex_flags, start_offset);
 
 		if (!Z_LVAL_P(return_value)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "internal date not correctly formatted");
+			php_error_docref(NULL, E_WARNING, "internal date not correctly formatted");
 			internal_date = NULL;
 		}
 	}
@@ -1364,7 +1362,7 @@ PHP_FUNCTION(imap_num_msg)
 	zval *streamind;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &streamind) == FAILURE) {
 		return;
 	}
 
@@ -1381,7 +1379,7 @@ PHP_FUNCTION(imap_ping)
 	zval *streamind;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &streamind) == FAILURE) {
 		return;
 	}
 
@@ -1398,7 +1396,7 @@ PHP_FUNCTION(imap_num_recent)
 	zval *streamind;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &streamind) == FAILURE) {
 		return;
 	}
 
@@ -1418,7 +1416,7 @@ PHP_FUNCTION(imap_get_quota)
 	int qroot_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &qroot, &qroot_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &streamind, &qroot, &qroot_len) == FAILURE) {
 		return;
 	}
 
@@ -1430,7 +1428,7 @@ PHP_FUNCTION(imap_get_quota)
 	/* set the callback for the GET_QUOTA function */
 	mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
 	if (!imap_getquota(imap_le_struct->imap_stream, qroot)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "c-client imap_getquota failed");
+		php_error_docref(NULL, E_WARNING, "c-client imap_getquota failed");
 		zval_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -1446,7 +1444,7 @@ PHP_FUNCTION(imap_get_quotaroot)
 	int mbox_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &mbox, &mbox_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &streamind, &mbox, &mbox_len) == FAILURE) {
 		return;
 	}
 
@@ -1458,7 +1456,7 @@ PHP_FUNCTION(imap_get_quotaroot)
 	/* set the callback for the GET_QUOTAROOT function */
 	mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
 	if (!imap_getquotaroot(imap_le_struct->imap_stream, mbox)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "c-client imap_getquotaroot failed");
+		php_error_docref(NULL, E_WARNING, "c-client imap_getquotaroot failed");
 		zval_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -1476,7 +1474,7 @@ PHP_FUNCTION(imap_set_quota)
 	pils *imap_le_struct;
 	STRINGLIST	limits;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsl", &streamind, &qroot, &qroot_len, &mailbox_size) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsl", &streamind, &qroot, &qroot_len, &mailbox_size) == FAILURE) {
 		return;
 	}
 
@@ -1499,7 +1497,7 @@ PHP_FUNCTION(imap_setacl)
 	int mailbox_len, id_len, rights_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss", &streamind, &mailbox, &mailbox_len, &id, &id_len, &rights, &rights_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsss", &streamind, &mailbox, &mailbox_len, &id, &id_len, &rights, &rights_len) == FAILURE) {
 		return;
 	}
 
@@ -1518,7 +1516,7 @@ PHP_FUNCTION(imap_getacl)
 	int mailbox_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &mailbox, &mailbox_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &streamind, &mailbox, &mailbox_len) == FAILURE) {
 		return;
 	}
 
@@ -1549,7 +1547,7 @@ PHP_FUNCTION(imap_expunge)
 	zval *streamind;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &streamind) == FAILURE) {
 		return;
 	}
 
@@ -1569,12 +1567,12 @@ PHP_FUNCTION(imap_gc)
 	pils *imap_le_struct;
 	long flags;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &streamind, &flags) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &streamind, &flags) == FAILURE) {
 		return;
 	}
 
 	if (flags && ((flags & ~(GC_TEXTS | GC_ELT | GC_ENV)) != 0)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the flags parameter");
+		php_error_docref(NULL, E_WARNING, "invalid value for the flags parameter");
 		RETURN_FALSE;
 	}
 
@@ -1595,7 +1593,7 @@ PHP_FUNCTION(imap_close)
 	long options = 0, flags = NIL;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind, &options) == FAILURE) {
+	if (zend_parse_parameters(argc, "r|l", &streamind, &options) == FAILURE) {
 		return;
 	}
 
@@ -1606,7 +1604,7 @@ PHP_FUNCTION(imap_close)
 
 		/* Check that flags is exactly equal to PHP_EXPUNGE or zero */
 		if (flags && ((flags & ~PHP_EXPUNGE) != 0)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the flags parameter");
+			php_error_docref(NULL, E_WARNING, "invalid value for the flags parameter");
 			RETURN_FALSE;
 		}
 
@@ -1635,7 +1633,7 @@ PHP_FUNCTION(imap_headers)
 	unsigned int msgno;
 	char tmp[MAILTMPLEN];
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &streamind) == FAILURE) {
 		return;
 	}
 
@@ -1685,12 +1683,12 @@ PHP_FUNCTION(imap_body)
 	char *body;
 	unsigned long body_len = 0;
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
 		return;
 	}
 
 	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -1705,7 +1703,7 @@ PHP_FUNCTION(imap_body)
 		msgindex = msgno;
 	}
 	if ((msgindex < 1) || ((unsigned) msgindex > imap_le_struct->imap_stream->nmsgs)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad message number");
+		php_error_docref(NULL, E_WARNING, "Bad message number");
 		RETURN_FALSE;
 	}
 
@@ -1728,7 +1726,7 @@ PHP_FUNCTION(imap_mail_copy)
 	int seq_len, folder_len, argc = ZEND_NUM_ARGS();
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rss|l", &streamind, &seq, &seq_len, &folder, &folder_len, &options) == FAILURE) {
+	if (zend_parse_parameters(argc, "rss|l", &streamind, &seq, &seq_len, &folder, &folder_len, &options) == FAILURE) {
 		return;
 	}
 
@@ -1753,7 +1751,7 @@ PHP_FUNCTION(imap_mail_move)
 	pils *imap_le_struct;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rss|l", &streamind, &seq, &seq_len, &folder, &folder_len, &options) == FAILURE) {
+	if (zend_parse_parameters(argc, "rss|l", &streamind, &seq, &seq_len, &folder, &folder_len, &options) == FAILURE) {
 		return;
 	}
 
@@ -1776,7 +1774,7 @@ PHP_FUNCTION(imap_createmailbox)
 	int folder_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &folder, &folder_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &streamind, &folder, &folder_len) == FAILURE) {
 		return;
 	}
 
@@ -1799,7 +1797,7 @@ PHP_FUNCTION(imap_renamemailbox)
 	int old_mailbox_len, new_mailbox_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &old_mailbox, &old_mailbox_len, &new_mailbox, &new_mailbox_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &streamind, &old_mailbox, &old_mailbox_len, &new_mailbox, &new_mailbox_len) == FAILURE) {
 		return;
 	}
 
@@ -1822,7 +1820,7 @@ PHP_FUNCTION(imap_deletemailbox)
 	int folder_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &folder, &folder_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &streamind, &folder, &folder_len) == FAILURE) {
 		return;
 	}
 
@@ -1846,7 +1844,7 @@ PHP_FUNCTION(imap_list)
 	pils *imap_le_struct;
 	STRINGLIST *cur=NIL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
 		return;
 	}
 
@@ -1885,7 +1883,7 @@ PHP_FUNCTION(imap_list_full)
 	FOBJECTLIST *cur=NIL;
 	char *delim=NIL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
 		return;
 	}
 
@@ -1914,7 +1912,7 @@ PHP_FUNCTION(imap_list_full)
 #else
 		add_property_string(&mboxob, "delimiter", cur->delimiter);
 #endif
-		add_next_index_object(return_value, &mboxob TSRMLS_CC);
+		add_next_index_object(return_value, &mboxob);
 		cur=cur->next;
 	}
 	mail_free_foblist(&IMAPG(imap_folder_objects), &IMAPG(imap_folder_objects_tail));
@@ -1933,7 +1931,7 @@ PHP_FUNCTION(imap_listscan)
 	pils *imap_le_struct;
 	STRINGLIST *cur=NIL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss", &streamind, &ref, &ref_len, &pat, &pat_len, &content, &content_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsss", &streamind, &ref, &ref_len, &pat, &pat_len, &content, &content_len) == FAILURE) {
 		return;
 	}
 
@@ -1965,7 +1963,7 @@ PHP_FUNCTION(imap_check)
 	pils *imap_le_struct;
 	char date[100];
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &streamind) == FAILURE) {
 		return;
 	}
 
@@ -1998,7 +1996,7 @@ PHP_FUNCTION(imap_delete)
 	long flags = 0;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rz|l", &streamind, &sequence, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "rz|l", &streamind, &sequence, &flags) == FAILURE) {
 		return;
 	}
 
@@ -2020,7 +2018,7 @@ PHP_FUNCTION(imap_undelete)
 	pils *imap_le_struct;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rz|l", &streamind, &sequence, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "rz|l", &streamind, &sequence, &flags) == FAILURE) {
 		return;
 	}
 
@@ -2046,7 +2044,7 @@ PHP_FUNCTION(imap_headerinfo)
 	ENVELOPE *en;
 	char dummy[2000], fulladdress[MAILTMPLEN + 1];
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rl|lls", &streamind, &msgno, &fromlength, &subjectlength, &defaulthost, &defaulthost_len) == FAILURE) {
+	if (zend_parse_parameters(argc, "rl|lls", &streamind, &msgno, &fromlength, &subjectlength, &defaulthost, &defaulthost_len) == FAILURE) {
 		return;
 	}
 
@@ -2054,7 +2052,7 @@ PHP_FUNCTION(imap_headerinfo)
 
 	if (argc >= 3) {
 		if (fromlength < 0 || fromlength > MAILTMPLEN) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "From length has to be between 0 and %d", MAILTMPLEN);
+			php_error_docref(NULL, E_WARNING, "From length has to be between 0 and %d", MAILTMPLEN);
 			RETURN_FALSE;
 		}
 	} else {
@@ -2062,7 +2060,7 @@ PHP_FUNCTION(imap_headerinfo)
 	}
 	if (argc >= 4) {
 		if (subjectlength < 0 || subjectlength > MAILTMPLEN) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Subject length has to be between 0 and %d", MAILTMPLEN);
+			php_error_docref(NULL, E_WARNING, "Subject length has to be between 0 and %d", MAILTMPLEN);
 			RETURN_FALSE;
 		}
 	} else {
@@ -2081,7 +2079,7 @@ PHP_FUNCTION(imap_headerinfo)
 
 	/* call a function to parse all the text, so that we can use the
 	   same function to parse text from other sources */
-	_php_make_header_object(return_value, en TSRMLS_CC);
+	_php_make_header_object(return_value, en);
 
 	/* now run through properties that are only going to be returned
 	   from a server, not text headers */
@@ -2124,7 +2122,7 @@ PHP_FUNCTION(imap_rfc822_parse_headers)
 	ENVELOPE *en;
 	int headers_len, defaulthost_len = 0, argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "s|s", &headers, &headers_len, &defaulthost, &defaulthost_len) == FAILURE) {
+	if (zend_parse_parameters(argc, "s|s", &headers, &headers_len, &defaulthost, &defaulthost_len) == FAILURE) {
 		return;
 	}
 
@@ -2136,7 +2134,7 @@ PHP_FUNCTION(imap_rfc822_parse_headers)
 
 	/* call a function to parse all the text, so that we can use the
 	   same function no matter where the headers are from */
-	_php_make_header_object(return_value, en TSRMLS_CC);
+	_php_make_header_object(return_value, en);
 	mail_free_envelope(&en);
 }
 /* }}} */
@@ -2152,7 +2150,7 @@ PHP_FUNCTION(imap_lsub)
 	pils *imap_le_struct;
 	STRINGLIST *cur=NIL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
 		return;
 	}
 
@@ -2190,7 +2188,7 @@ PHP_FUNCTION(imap_lsub_full)
 	FOBJECTLIST *cur=NIL;
 	char *delim=NIL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
 		return;
 	}
 
@@ -2219,7 +2217,7 @@ PHP_FUNCTION(imap_lsub_full)
 #else
 		add_property_string(&mboxob, "delimiter", cur->delimiter);
 #endif
-		add_next_index_object(return_value, &mboxob TSRMLS_CC);
+		add_next_index_object(return_value, &mboxob);
 		cur=cur->next;
 	}
 	mail_free_foblist (&IMAPG(imap_sfolder_objects), &IMAPG(imap_sfolder_objects_tail));
@@ -2237,7 +2235,7 @@ PHP_FUNCTION(imap_subscribe)
 	int folder_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &folder, &folder_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &streamind, &folder, &folder_len) == FAILURE) {
 		return;
 	}
 
@@ -2260,7 +2258,7 @@ PHP_FUNCTION(imap_unsubscribe)
 	int folder_len;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &folder, &folder_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &streamind, &folder, &folder_len) == FAILURE) {
 		return;
 	}
 
@@ -2284,12 +2282,12 @@ PHP_FUNCTION(imap_fetchstructure)
 	BODY *body;
 	int msgindex, argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
 		return;
 	}
 
 	if (flags && ((flags & ~FT_UID) != 0)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -2314,11 +2312,11 @@ PHP_FUNCTION(imap_fetchstructure)
 	mail_fetchstructure_full(imap_le_struct->imap_stream, msgno, &body , (argc == 3 ? flags : NIL));
 
 	if (!body) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No body information available");
+		php_error_docref(NULL, E_WARNING, "No body information available");
 		RETURN_FALSE;
 	}
 
-	_php_imap_add_body(return_value, body TSRMLS_CC);
+	_php_imap_add_body(return_value, body);
 }
 /* }}} */
 
@@ -2334,12 +2332,12 @@ PHP_FUNCTION(imap_fetchbody)
 	unsigned long len;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rls|l", &streamind, &msgno, &sec, &sec_len, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "rls|l", &streamind, &msgno, &sec, &sec_len, &flags) == FAILURE) {
 		return;
 	}
 
 	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -2353,7 +2351,7 @@ PHP_FUNCTION(imap_fetchbody)
 	body = mail_fetchbody_full(imap_le_struct->imap_stream, msgno, sec, &len, (argc == 4 ? flags : NIL));
 
 	if (!body) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No body information available");
+		php_error_docref(NULL, E_WARNING, "No body information available");
 		RETURN_FALSE;
 	}
 	RETVAL_STRINGL(body, len);
@@ -2374,12 +2372,12 @@ PHP_FUNCTION(imap_fetchmime)
 	unsigned long len;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rls|l", &streamind, &msgno, &sec, &sec_len, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "rls|l", &streamind, &msgno, &sec, &sec_len, &flags) == FAILURE) {
 		return;
 	}
 
 	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -2393,7 +2391,7 @@ PHP_FUNCTION(imap_fetchmime)
 	body = mail_fetch_mime(imap_le_struct->imap_stream, msgno, sec, &len, (argc == 4 ? flags : NIL));
 
 	if (!body) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No body MIME information available");
+		php_error_docref(NULL, E_WARNING, "No body MIME information available");
 		RETURN_FALSE;
 	}
 	RETVAL_STRINGL(body, len);
@@ -2412,7 +2410,7 @@ PHP_FUNCTION(imap_savebody)
 	int section_len = 0, close_stream = 1;
 	long msgno, flags = 0;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzl|sl", &stream, &out, &msgno, &section, &section_len, &flags)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "rzl|sl", &stream, &out, &msgno, &section, &section_len, &flags)) {
 		RETURN_FALSE;
 	}
 
@@ -2462,7 +2460,7 @@ PHP_FUNCTION(imap_base64)
 	int text_len;
 	unsigned long newlength;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &text, &text_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &text, &text_len) == FAILURE) {
 		return;
 	}
 
@@ -2485,7 +2483,7 @@ PHP_FUNCTION(imap_qprint)
 	int text_len;
 	unsigned long newlength;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &text, &text_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &text, &text_len) == FAILURE) {
 		return;
 	}
 
@@ -2508,7 +2506,7 @@ PHP_FUNCTION(imap_8bit)
 	int text_len;
 	unsigned long newlength;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &text, &text_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &text, &text_len) == FAILURE) {
 		return;
 	}
 
@@ -2531,7 +2529,7 @@ PHP_FUNCTION(imap_binary)
 	int text_len;
 	unsigned long newlength;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &text, &text_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &text, &text_len) == FAILURE) {
 		return;
 	}
 
@@ -2555,7 +2553,7 @@ PHP_FUNCTION(imap_mailboxmsginfo)
 	char date[100];
 	unsigned int msgno, unreadmsg, deletedmsg, msize;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &streamind) == FAILURE) {
 		return;
 	}
 
@@ -2602,7 +2600,7 @@ PHP_FUNCTION(imap_rfc822_write_address)
 	ADDRESS *addr;
 	zend_string *string;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &mailbox, &mailbox_len, &host, &host_len, &personal, &personal_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss", &mailbox, &mailbox_len, &host, &host_len, &personal, &personal_len) == FAILURE) {
 		return;
 	}
 
@@ -2624,7 +2622,7 @@ PHP_FUNCTION(imap_rfc822_write_address)
 	addr->error=NIL;
 	addr->adl=NIL;
 
-	string = _php_rfc822_write_address(addr TSRMLS_CC);
+	string = _php_rfc822_write_address(addr);
 	if (string) {
 		RETVAL_STR(string);
 	} else {
@@ -2643,7 +2641,7 @@ PHP_FUNCTION(imap_rfc822_parse_adrlist)
 	ADDRESS *addresstmp;
 	ENVELOPE *env;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &str, &str_len, &defaulthost, &defaulthost_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &str, &str_len, &defaulthost, &defaulthost_len) == FAILURE) {
 		return;
 	}
 
@@ -2672,7 +2670,7 @@ PHP_FUNCTION(imap_rfc822_parse_adrlist)
 		if (addresstmp->adl) {
 			add_property_string(&tovals, "adl", addresstmp->adl);
 		}
-		add_next_index_object(return_value, &tovals TSRMLS_CC);
+		add_next_index_object(return_value, &tovals);
 	} while ((addresstmp = addresstmp->next));
 
 	mail_free_envelope(&env);
@@ -2687,7 +2685,7 @@ PHP_FUNCTION(imap_utf8)
 	int str_len;
 	SIZEDTEXT src, dest;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len) == FAILURE) {
 		return;
 	}
 
@@ -2751,7 +2749,7 @@ PHP_FUNCTION(imap_utf7_decode)
 		ST_DECODE3
 	} state;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) {
 		return;
 	}
 
@@ -2765,12 +2763,12 @@ PHP_FUNCTION(imap_utf7_decode)
 		if (state == ST_NORMAL) {
 			/* process printable character */
 			if (SPECIAL(*inp)) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid modified UTF-7 character: `%c'", *inp);
+				php_error_docref(NULL, E_WARNING, "Invalid modified UTF-7 character: `%c'", *inp);
 				RETURN_FALSE;
 			} else if (*inp != '&') {
 				outlen++;
 			} else if (inp + 1 == endp) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected end of string");
+				php_error_docref(NULL, E_WARNING, "Unexpected end of string");
 				RETURN_FALSE;
 			} else if (inp[1] != '-') {
 				state = ST_DECODE0;
@@ -2781,12 +2779,12 @@ PHP_FUNCTION(imap_utf7_decode)
 		} else if (*inp == '-') {
 			/* return to NORMAL mode */
 			if (state == ST_DECODE1) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Stray modified base64 character: `%c'", *--inp);
+				php_error_docref(NULL, E_WARNING, "Stray modified base64 character: `%c'", *--inp);
 				RETURN_FALSE;
 			}
 			state = ST_NORMAL;
 		} else if (!B64CHAR(*inp)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid modified base64 character: `%c'", *inp);
+			php_error_docref(NULL, E_WARNING, "Invalid modified base64 character: `%c'", *inp);
 			RETURN_FALSE;
 		} else {
 			switch (state) {
@@ -2807,7 +2805,7 @@ PHP_FUNCTION(imap_utf7_decode)
 
 	/* enforce end state */
 	if (state != ST_NORMAL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected end of string");
+		php_error_docref(NULL, E_WARNING, "Unexpected end of string");
 		RETURN_FALSE;
 	}
 
@@ -2864,7 +2862,7 @@ PHP_FUNCTION(imap_utf7_decode)
 #if PHP_DEBUG
 	/* warn if we computed outlen incorrectly */
 	if (outp - out != outlen) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "outp - out [%ld] != outlen [%d]", outp - out, outlen);
+		php_error_docref(NULL, E_WARNING, "outp - out [%ld] != outlen [%d]", outp - out, outlen);
 	}
 #endif
 
@@ -2890,7 +2888,7 @@ PHP_FUNCTION(imap_utf7_encode)
 		ST_ENCODE2
 	} state;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) {
 		return;
 	}
 
@@ -2995,7 +2993,7 @@ static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
 	int in_len;
 	unsigned char *out;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &in, &in_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &in, &in_len) == FAILURE) {
 		return;
 	}
 
@@ -3044,7 +3042,7 @@ PHP_FUNCTION(imap_setflag_full)
 	long flags = 0;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|l", &streamind, &sequence, &sequence_len, &flag, &flag_len, &flags) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss|l", &streamind, &sequence, &sequence_len, &flag, &flag_len, &flags) == FAILURE) {
 		return;
 	}
 
@@ -3066,7 +3064,7 @@ PHP_FUNCTION(imap_clearflag_full)
 	pils *imap_le_struct;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rss|l", &streamind, &sequence, &sequence_len, &flag, &flag_len, &flags) ==FAILURE) {
+	if (zend_parse_parameters(argc, "rss|l", &streamind, &sequence, &sequence_len, &flag, &flag_len, &flags) ==FAILURE) {
 		return;
 	}
 
@@ -3092,19 +3090,19 @@ PHP_FUNCTION(imap_sort)
 	SEARCHPGM *spg=NIL;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rll|lss", &streamind, &pgm, &rev, &flags, &criteria, &criteria_len, &charset, &charset_len) == FAILURE) {
+	if (zend_parse_parameters(argc, "rll|lss", &streamind, &pgm, &rev, &flags, &criteria, &criteria_len, &charset, &charset_len) == FAILURE) {
 		return;
 	}
 
 	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
 
 	if (pgm > SORTSIZE) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized sort criteria");
+		php_error_docref(NULL, E_WARNING, "Unrecognized sort criteria");
 		RETURN_FALSE;
 	}
 	if (argc >= 4) {
 		if (flags < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Search options parameter has to be greater than or equal to 0");
+			php_error_docref(NULL, E_WARNING, "Search options parameter has to be greater than or equal to 0");
 			RETURN_FALSE;
 		}
 	}
@@ -3146,12 +3144,12 @@ PHP_FUNCTION(imap_fetchheader)
 	pils *imap_le_struct;
 	int msgindex, argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
 		return;
 	}
 
 	if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT)) != 0)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -3181,7 +3179,7 @@ PHP_FUNCTION(imap_uid)
 	pils *imap_le_struct;
 	int msgindex;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &streamind, &msgno) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &streamind, &msgno) == FAILURE) {
 		return;
 	}
 
@@ -3189,7 +3187,7 @@ PHP_FUNCTION(imap_uid)
 
 	msgindex = msgno;
 	if ((msgindex < 1) || ((unsigned) msgindex > imap_le_struct->imap_stream->nmsgs)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad message number");
+		php_error_docref(NULL, E_WARNING, "Bad message number");
 		RETURN_FALSE;
 	}
 
@@ -3205,7 +3203,7 @@ PHP_FUNCTION(imap_msgno)
 	long msgno;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &streamind, &msgno) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &streamind, &msgno) == FAILURE) {
 		return;
 	}
 
@@ -3225,7 +3223,7 @@ PHP_FUNCTION(imap_status)
 	long flags;
 	pils *imap_le_struct;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsl", &streamind, &mbx, &mbx_len, &flags) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsl", &streamind, &mbx, &mbx_len, &flags) == FAILURE) {
 		return;
 	}
 
@@ -3269,14 +3267,14 @@ PHP_FUNCTION(imap_bodystruct)
 	PARAMETER *par, *dpar;
 	BODY *body;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &streamind, &msg, &section, &section_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rls", &streamind, &msg, &section, &section_len) == FAILURE) {
 		return;
 	}
 
 	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
 
 	if (!msg || msg < 1 || (unsigned) msg > imap_le_struct->imap_stream->nmsgs) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad message number");
+		php_error_docref(NULL, E_WARNING, "Bad message number");
 		RETURN_FALSE;
 	}
 
@@ -3336,9 +3334,9 @@ PHP_FUNCTION(imap_bodystruct)
 			object_init(&dparam);
 			add_property_string(&dparam, "attribute", dpar->attribute);
 			add_property_string(&dparam, "value", dpar->value);
-			add_next_index_object(&dparametres, &dparam TSRMLS_CC);
+			add_next_index_object(&dparametres, &dparam);
 		} while ((dpar = dpar->next));
-		add_assoc_object(return_value, "dparameters", &dparametres TSRMLS_CC);
+		add_assoc_object(return_value, "dparameters", &dparametres);
 	} else {
 		add_property_long(return_value, "ifdparameters", 0);
 	}
@@ -3357,13 +3355,13 @@ PHP_FUNCTION(imap_bodystruct)
 				add_property_string(&param, "value", par->value);
 			}
 
-			add_next_index_object(&parametres, &param TSRMLS_CC);
+			add_next_index_object(&parametres, &param);
 		} while ((par = par->next));
 	} else {
 		object_init(&parametres);
 		add_property_long(return_value, "ifparameters", 0);
 	}
-	add_assoc_object(return_value, "parameters", &parametres TSRMLS_CC);
+	add_assoc_object(return_value, "parameters", &parametres);
 }
 
 /* }}} */
@@ -3381,12 +3379,12 @@ PHP_FUNCTION(imap_fetch_overview)
 	long status, flags = 0L;
 	int argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rs|l", &streamind, &sequence, &sequence_len, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "rs|l", &streamind, &sequence, &sequence_len, &flags) == FAILURE) {
 		return;
 	}
 
 	if (flags && ((flags & ~FT_UID) != 0)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		php_error_docref(NULL, E_WARNING, "invalid value for the options parameter");
 		RETURN_FALSE;
 	}
 
@@ -3412,14 +3410,14 @@ PHP_FUNCTION(imap_fetch_overview)
 				}
 				if (env->from) {
 					env->from->next=NULL;
-					address =_php_rfc822_write_address(env->from TSRMLS_CC);
+					address =_php_rfc822_write_address(env->from);
 					if (address) {
 						add_property_str(&myoverview, "from", address);
 					}
 				}
 				if (env->to) {
 					env->to->next = NULL;
-					address = _php_rfc822_write_address(env->to TSRMLS_CC);
+					address = _php_rfc822_write_address(env->to);
 					if (address) {
 						add_property_str(&myoverview, "to", address);
 					}
@@ -3446,7 +3444,7 @@ PHP_FUNCTION(imap_fetch_overview)
 				add_property_long(&myoverview, "seen", elt->seen);
 				add_property_long(&myoverview, "draft", elt->draft);
 				add_property_long(&myoverview, "udate", mail_longdate(elt));
-				add_next_index_object(return_value, &myoverview TSRMLS_CC);
+				add_next_index_object(return_value, &myoverview);
 			}
 		}
 	}
@@ -3469,7 +3467,7 @@ PHP_FUNCTION(imap_mail_compose)
 	int toppart = 0;
 	int first;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "aa", &envelope, &body) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "aa", &envelope, &body) == FAILURE) {
 		return;
 	}
 
@@ -3545,7 +3543,7 @@ PHP_FUNCTION(imap_mail_compose)
 			first = 0;
 
 			if (Z_TYPE_P(data) != IS_ARRAY) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "body parameter must be a non-empty array");
+				php_error_docref(NULL, E_WARNING, "body parameter must be a non-empty array");
 				RETURN_FALSE;
 			}
 
@@ -3745,12 +3743,12 @@ PHP_FUNCTION(imap_mail_compose)
 	} ZEND_HASH_FOREACH_END();
 
 	if (first) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "body parameter must be a non-empty array");
+		php_error_docref(NULL, E_WARNING, "body parameter must be a non-empty array");
 		RETURN_FALSE;
 	}
 
 	if (bod && bod->type == TYPEMULTIPART && (!bod->nested.part || !bod->nested.part->next)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot generate multipart e-mail without components.");
+		php_error_docref(NULL, E_WARNING, "cannot generate multipart e-mail without components.");
 		RETVAL_FALSE;
 		goto done;
 	}
@@ -3809,7 +3807,7 @@ PHP_FUNCTION(imap_mail_compose)
 			if (!cookie) {
 				cookie = "-";
 			} else if (strlen(cookie) > (SENDBUFLEN - 2 - 2 - 2)) { /* validate cookie length -- + CRLF * 2 */
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "The boundary should be no longer than 4kb");
+				php_error_docref(NULL, E_WARNING, "The boundary should be no longer than 4kb");
 				RETVAL_FALSE;
 				goto done;
 			}
@@ -3861,7 +3859,7 @@ done:
 
 /* {{{ _php_imap_mail
  */
-int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath TSRMLS_DC)
+int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath)
 {
 #ifdef PHP_WIN32
 	int tsm_err;
@@ -3981,12 +3979,12 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
 		strlcat(bufferHeader, headers, bufferLen + 1);
 	}
 
-	if (TSendMail(INI_STR("SMTP"), &tsm_err, &tsm_errmsg, bufferHeader, subject, bufferTo, message, bufferCc, bufferBcc, rpath TSRMLS_CC) != SUCCESS) {
+	if (TSendMail(INI_STR("SMTP"), &tsm_err, &tsm_errmsg, bufferHeader, subject, bufferTo, message, bufferCc, bufferBcc, rpath) != SUCCESS) {
 		if (tsm_errmsg) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", tsm_errmsg);
+			php_error_docref(NULL, E_WARNING, "%s", tsm_errmsg);
 			efree(tsm_errmsg);
 		} else {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", GetSMErrorText(tsm_err));
+			php_error_docref(NULL, E_WARNING, "%s", GetSMErrorText(tsm_err));
 		}
 		PHP_IMAP_CLEAN;
 		return 0;
@@ -4014,7 +4012,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
 			return 1;
 		}
 	} else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute mail delivery program");
+		php_error_docref(NULL, E_WARNING, "Could not execute mail delivery program");
 		return 0;
 	}
 #endif
@@ -4029,31 +4027,31 @@ PHP_FUNCTION(imap_mail)
 	char *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *cc=NULL, *bcc=NULL, *rpath=NULL;
 	int to_len, message_len, headers_len, subject_len, cc_len, bcc_len, rpath_len, argc = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "sss|ssss", &to, &to_len, &subject, &subject_len, &message, &message_len,
+	if (zend_parse_parameters(argc, "sss|ssss", &to, &to_len, &subject, &subject_len, &message, &message_len,
 		&headers, &headers_len, &cc, &cc_len, &bcc, &bcc_len, &rpath, &rpath_len) == FAILURE) {
 		return;
 	}
 
 	/* To: */
 	if (!to_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No to field in mail command");
+		php_error_docref(NULL, E_WARNING, "No to field in mail command");
 		RETURN_FALSE;
 	}
 
 	/* Subject: */
 	if (!subject_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No subject field in mail command");
+		php_error_docref(NULL, E_WARNING, "No subject field in mail command");
 		RETURN_FALSE;
 	}
 
 	/* message body */
 	if (!message_len) {
 		/* this is not really an error, so it is allowed. */
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No message string in mail command");
+		php_error_docref(NULL, E_WARNING, "No message string in mail command");
 		message = NULL;
 	}
 
-	if (_php_imap_mail(to, subject, message, headers, cc, bcc, rpath TSRMLS_CC)) {
+	if (_php_imap_mail(to, subject, message, headers, cc, bcc, rpath)) {
 		RETURN_TRUE;
 	} else {
 		RETURN_FALSE;
@@ -4075,7 +4073,7 @@ PHP_FUNCTION(imap_search)
 	int argc = ZEND_NUM_ARGS();
 	SEARCHPGM *pgm = NIL;
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls", &streamind, &criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) {
+	if (zend_parse_parameters(argc, "rs|ls", &streamind, &criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) {
 		return;
 	}
 
@@ -4199,7 +4197,7 @@ PHP_FUNCTION(imap_mime_header_decode)
 	long charset_token, encoding_token, end_token, end, offset=0, i;
 	unsigned long newlength;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len) == FAILURE) {
 		return;
 	}
 
@@ -4300,7 +4298,7 @@ static long _php_rfc822_soutr (void *stream, char *string)
 
 /* {{{ _php_rfc822_write_address
  */
-static zend_string* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC)
+static zend_string* _php_rfc822_write_address(ADDRESS *addresslist)
 {
 	char address[MAILTMPLEN];
 	smart_str ret = {0};
@@ -4380,12 +4378,12 @@ static int _php_imap_address_size (ADDRESS *addresslist)
 
 /* {{{ _php_rfc822_write_address
  */
-static zend_string* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC)
+static zend_string* _php_rfc822_write_address(ADDRESS *addresslist)
 {
 	char address[SENDBUFLEN];
 
 	if (_php_imap_address_size(addresslist) >= SENDBUFLEN) {
-		php_error_docref(NULL TSRMLS_CC, E_ERROR, "Address buffer overflow");
+		php_error_docref(NULL, E_ERROR, "Address buffer overflow");
 		return NULL;
 	}
 	address[0] = 0;
@@ -4396,7 +4394,7 @@ static zend_string* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC)
 #endif
 /* {{{ _php_imap_parse_address
  */
-static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddress TSRMLS_DC)
+static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddress)
 {
 	zend_string *fulladdress;
 	ADDRESS *addresstmp;
@@ -4404,7 +4402,7 @@ static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddres
 
 	addresstmp = addresslist;
 
-	fulladdress = _php_rfc822_write_address(addresstmp TSRMLS_CC);
+	fulladdress = _php_rfc822_write_address(addresstmp);
 
 	addresstmp = addresslist;
 	do {
@@ -4413,7 +4411,7 @@ static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddres
 		if (addresstmp->adl) add_property_string(&tmpvals, "adl", addresstmp->adl);
 		if (addresstmp->mailbox) add_property_string(&tmpvals, "mailbox", addresstmp->mailbox);
 		if (addresstmp->host) add_property_string(&tmpvals, "host", addresstmp->host);
-		add_next_index_object(paddress, &tmpvals TSRMLS_CC);
+		add_next_index_object(paddress, &tmpvals);
 	} while ((addresstmp = addresstmp->next));
 	return fulladdress;
 }
@@ -4421,7 +4419,7 @@ static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddres
 
 /* {{{ _php_make_header_object
  */
-static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC)
+static void _php_make_header_object(zval *myzvalue, ENVELOPE *en)
 {
 	zval paddress;
 	zend_string *fulladdress=NULL;
@@ -4441,72 +4439,72 @@ static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC)
 
 	if (en->to) {
 		array_init(&paddress);
-		fulladdress = _php_imap_parse_address(en->to, &paddress TSRMLS_CC);
+		fulladdress = _php_imap_parse_address(en->to, &paddress);
 		if (fulladdress) {
 			add_property_str(myzvalue, "toaddress", fulladdress);
 		}
-		add_assoc_object(myzvalue, "to", &paddress TSRMLS_CC);
+		add_assoc_object(myzvalue, "to", &paddress);
 	}
 
 	if (en->from) {
 		array_init(&paddress);
-		fulladdress = _php_imap_parse_address(en->from, &paddress TSRMLS_CC);
+		fulladdress = _php_imap_parse_address(en->from, &paddress);
 		if (fulladdress) {
 			add_property_str(myzvalue, "fromaddress", fulladdress);
 		}
-		add_assoc_object(myzvalue, "from", &paddress TSRMLS_CC);
+		add_assoc_object(myzvalue, "from", &paddress);
 	}
 
 	if (en->cc) {
 		array_init(&paddress);
-		fulladdress = _php_imap_parse_address(en->cc, &paddress TSRMLS_CC);
+		fulladdress = _php_imap_parse_address(en->cc, &paddress);
 		if (fulladdress) {
 			add_property_str(myzvalue, "ccaddress", fulladdress);
 		}
-		add_assoc_object(myzvalue, "cc", &paddress TSRMLS_CC);
+		add_assoc_object(myzvalue, "cc", &paddress);
 	}
 
 	if (en->bcc) {
 		array_init(&paddress);
-		fulladdress = _php_imap_parse_address(en->bcc, &paddress TSRMLS_CC);
+		fulladdress = _php_imap_parse_address(en->bcc, &paddress);
 		if (fulladdress) {
 			add_property_str(myzvalue, "bccaddress", fulladdress);
 		}
-		add_assoc_object(myzvalue, "bcc", &paddress TSRMLS_CC);
+		add_assoc_object(myzvalue, "bcc", &paddress);
 	}
 
 	if (en->reply_to) {
 		array_init(&paddress);
-		fulladdress = _php_imap_parse_address(en->reply_to, &paddress TSRMLS_CC);
+		fulladdress = _php_imap_parse_address(en->reply_to, &paddress);
 		if (fulladdress) {
 			add_property_str(myzvalue, "reply_toaddress", fulladdress);
 		}
-		add_assoc_object(myzvalue, "reply_to", &paddress TSRMLS_CC);
+		add_assoc_object(myzvalue, "reply_to", &paddress);
 	}
 
 	if (en->sender) {
 		array_init(&paddress);
-		fulladdress = _php_imap_parse_address(en->sender, &paddress TSRMLS_CC);
+		fulladdress = _php_imap_parse_address(en->sender, &paddress);
 		if (fulladdress) {
 			add_property_str(myzvalue, "senderaddress", fulladdress);
 		}
-		add_assoc_object(myzvalue, "sender", &paddress TSRMLS_CC);
+		add_assoc_object(myzvalue, "sender", &paddress);
 	}
 
 	if (en->return_path) {
 		array_init(&paddress);
-		fulladdress = _php_imap_parse_address(en->return_path, &paddress TSRMLS_CC);
+		fulladdress = _php_imap_parse_address(en->return_path, &paddress);
 		if (fulladdress) {
 			add_property_str(myzvalue, "return_pathaddress", fulladdress);
 		}
-		add_assoc_object(myzvalue, "return_path", &paddress TSRMLS_CC);
+		add_assoc_object(myzvalue, "return_path", &paddress);
 	}
 }
 /* }}} */
 
 /* {{{ _php_imap_add_body
  */
-void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC)
+void _php_imap_add_body(zval *arg, BODY *body)
 {
 	zval parametres, param, dparametres, dparam;
 	PARAMETER *par, *dpar;
@@ -4565,9 +4563,9 @@ void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC)
 			object_init(&dparam);
 			add_property_string(&dparam, "attribute", dpar->attribute);
 			add_property_string(&dparam, "value", dpar->value);
-			add_next_index_object(&dparametres, &dparam TSRMLS_CC);
+			add_next_index_object(&dparametres, &dparam);
 		} while ((dpar = dpar->next));
-		add_assoc_object(arg, "dparameters", &dparametres TSRMLS_CC);
+		add_assoc_object(arg, "dparameters", &dparametres);
 	} else {
 		add_property_long(arg, "ifdparameters", 0);
 	}
@@ -4586,23 +4584,23 @@ void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC)
 				add_property_string(&param, "value", par->value);
 			}
 
-			add_next_index_object(&parametres, &param TSRMLS_CC);
+			add_next_index_object(&parametres, &param);
 		} while ((par = par->next));
 	} else {
 		object_init(&parametres);
 		add_property_long(arg, "ifparameters", 0);
 	}
-	add_assoc_object(arg, "parameters", &parametres TSRMLS_CC);
+	add_assoc_object(arg, "parameters", &parametres);
 
 	/* multipart message ? */
 	if (body->type == TYPEMULTIPART) {
 		array_init(&parametres);
 		for (part = body->CONTENT_PART; part; part = part->next) {
 			object_init(&param);
-			_php_imap_add_body(&param, &part->body TSRMLS_CC);
-			add_next_index_object(&parametres, &param TSRMLS_CC);
+			_php_imap_add_body(&param, &part->body);
+			add_next_index_object(&parametres, &param);
 		}
-		add_assoc_object(arg, "parts", &parametres TSRMLS_CC);
+		add_assoc_object(arg, "parts", &parametres);
 	}
 
 	/* encapsulated message ? */
@@ -4610,9 +4608,9 @@ void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC)
 		body = body->CONTENT_MSG_BODY;
 		array_init(&parametres);
 		object_init(&param);
-		_php_imap_add_body(&param, body TSRMLS_CC);
-		add_next_index_object(&parametres, &param TSRMLS_CC);
-		add_assoc_object(arg, "parts", &parametres TSRMLS_CC);
+		_php_imap_add_body(&param, body);
+		add_next_index_object(&parametres, &param);
+		add_assoc_object(arg, "parts", &parametres);
 	}
 }
 /* }}} */
@@ -4676,7 +4674,7 @@ PHP_FUNCTION(imap_thread)
 	int argc = ZEND_NUM_ARGS();
 	SEARCHPGM *pgm = NIL;
 
-	if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind, &flags) == FAILURE) {
+	if (zend_parse_parameters(argc, "r|l", &streamind, &flags) == FAILURE) {
 		return;
 	}
 
@@ -4689,7 +4687,7 @@ PHP_FUNCTION(imap_thread)
 	}
 
 	if(top == NIL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function returned an empty tree");
+		php_error_docref(NULL, E_WARNING, "Function returned an empty tree");
 		RETURN_FALSE;
 	}
 
@@ -4709,7 +4707,7 @@ PHP_FUNCTION(imap_timeout)
 	long ttype, timeout=-1;
 	int timeout_type;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &ttype, &timeout) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &ttype, &timeout) == FAILURE) {
 		RETURN_FALSE;
 	}
 
@@ -4764,7 +4762,6 @@ PHP_FUNCTION(imap_timeout)
 #define GETS_FETCH_SIZE 8196LU
 static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DATA *md) /* {{{ */
 {
-	TSRMLS_FETCH();
 
 	/*	write to the gets stream if it is set,
 		otherwise forward to c-clients gets */
@@ -4783,10 +4780,10 @@ static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DA
 			}
 
 			if (!f(stream, read, buf)) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read from socket");
+				php_error_docref(NULL, E_WARNING, "Failed to read from socket");
 				break;
 			} else if (read != php_stream_write(IMAPG(gets_stream), buf, read)) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to write to stream");
+				php_error_docref(NULL, E_WARNING, "Failed to write to stream");
 				break;
 			}
 		}
@@ -4797,7 +4794,7 @@ static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DA
 		if (f(stream, size, buf)) {
 			buf[size] = '\0';
 		} else {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read from socket");
+			php_error_docref(NULL, E_WARNING, "Failed to read from socket");
 			free(buf);
 			buf = NULL;
 		}
@@ -4811,7 +4808,6 @@ static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DA
 PHP_IMAP_EXPORT void mm_searched(MAILSTREAM *stream, unsigned long number)
 {
 	MESSAGELIST *cur = NIL;
-	TSRMLS_FETCH();
 
 	if (IMAPG(imap_messages) == NIL) {
 		IMAPG(imap_messages) = mail_newmessagelist();
@@ -4844,7 +4840,6 @@ PHP_IMAP_EXPORT void mm_flags(MAILSTREAM *stream, unsigned long number)
 PHP_IMAP_EXPORT void mm_notify(MAILSTREAM *stream, char *str, long errflg)
 {
 	STRINGLIST *cur = NIL;
-	TSRMLS_FETCH();
 
 	if (strncmp(str, "[ALERT] ", 8) == 0) {
 		if (IMAPG(imap_alertstack) == NIL) {
@@ -4868,7 +4863,6 @@ PHP_IMAP_EXPORT void mm_list(MAILSTREAM *stream, DTYPE delimiter, char *mailbox,
 {
 	STRINGLIST *cur=NIL;
 	FOBJECTLIST *ocur=NIL;
-	TSRMLS_FETCH();
 
 	if (IMAPG(folderlist_style) == FLIST_OBJECT) {
 		/* build up a the new array of objects */
@@ -4915,7 +4909,6 @@ PHP_IMAP_EXPORT void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char *mailbox,
 {
 	STRINGLIST *cur=NIL;
 	FOBJECTLIST *ocur=NIL;
-	TSRMLS_FETCH();
 
 	if (IMAPG(folderlist_style) == FLIST_OBJECT) {
 		/* build the array of objects */
@@ -4957,7 +4950,6 @@ PHP_IMAP_EXPORT void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char *mailbox,
 
 PHP_IMAP_EXPORT void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS *status)
 {
-	TSRMLS_FETCH();
 
 	IMAPG(status_flags)=status->flags;
 	if (IMAPG(status_flags) & SA_MESSAGES) {
@@ -4980,7 +4972,6 @@ PHP_IMAP_EXPORT void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS *st
 PHP_IMAP_EXPORT void mm_log(char *str, long errflg)
 {
 	ERRORLIST *cur = NIL;
-	TSRMLS_FETCH();
 
 	/* Author: CJH */
 	if (errflg != NIL) { /* CJH: maybe put these into a more comprehensive log for debugging purposes? */
@@ -5012,7 +5003,6 @@ PHP_IMAP_EXPORT void mm_dlog(char *str)
 
 PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial)
 {
-	TSRMLS_FETCH();
 
 	if (*mb->user) {
 		strlcpy (user, mb->user, MAILTMPLEN);