@- Made the IMAP and LDAP modules compilable under Windows and thread-safe (Zeev)

11 files changed, 296 insertions, 4437 deletions

diff --git a/ext/imap/IMAP_Win32_HOWTO.txt b/ext/imap/IMAP_Win32_HOWTO.txt
new file mode 100644
index 0000000000..50b2689de5
--- /dev/null
+++ b/ext/imap/IMAP_Win32_HOWTO.txt
@@ -0,0 +1,28 @@
+Rules for building IMAP
+-----------------------
+
+Note 1:  You *must* use NT's cmd.exe for this job;  4NT.exe will NOT work properly.
+Note 2:  During the entire build process, you can ignore warnings about
+         inconsistent DLL linkage.
+
+- Open IMAP into a brother directory to php4.  Rename this directory
+  to 'IMAP'.
+- Change to the IMAP directory.
+- Edit .\src\osdep\nt\makefile.nt:
+  Search for '/MT', and change it to '/MD'.
+  Search for 'ERASE'.  Comment out the line that contains the ERASE command.
+- Run 'nmake nt'
+- At some point, the build will fail.  Rerun 'nmake nt'.
+- After a while, the build will fail again, failing to find auths.c.
+- Change directory to 'c-client'
+- Create an a file named auths.c, that includes the following line:
+  #include "auth_md5.c"
+- Run 'nmake -f makefile.nt'
+
+At this point, cclient.lib should be generated.
+
+Start Visual Studio, load php_modules.dsw, select the LDAP projects, and build
+it.
+
+
+  
\ No newline at end of file
diff --git a/ext/imap/imap.c b/ext/imap/imap.c
deleted file mode 100644
index e59ef2801e..0000000000
--- a/ext/imap/imap.c
+++ /dev/null
@@ -1,3962 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_01.txt.                                 |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Rex Logan           <veebert@dimensional.com>               |
-   |          Mark Musone         <musone@afterfive.com>                  |
-   |          Brian Wang          <brian@vividnet.com>                    |
-   |          Kaj-Michael Lang    <milang@tal.org>                        |
-   |          Antoni Pamies Olive <toni@readysoft.net>                    |
-   |          Rasmus Lerdorf      <rasmus@lerdorf.on.ca>                  |
-   |          Chuck Hagenbuch     <chuck@horde.org>                       |
-   | PHP 4.0 updates:  Zeev Suraski <zeev@zend.com>                       |
-   +----------------------------------------------------------------------+
- */
-/* $Id$ */
-
-#define IMAP41
-
-#ifdef ERROR
-#undef ERROR
-#endif
-
-#include "php.h"
-#include "php_ini.h"
-
-#ifdef COMPILE_DL_IMAP
-#include "dl/phpdl.h"
-#endif
-
-#if HAVE_IMAP
-
-#include <time.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <signal.h>
-#include "imap.h"
-#include "mail.h"
-#include "rfc822.h"
-#include "modules.h"
-#if (WIN32|WINNT)
-#include "winsock.h"
-MAILSTREAM DEFAULTPROTO;
-#endif
-
-#ifdef IMAP41
-#define LSIZE text.size
-#define LTEXT text.data
-#define DTYPE int
-#define CONTENT_PART nested.part
-#define CONTENT_MSG_BODY nested.msg->body
-#define IMAPVER "Imap 4R1"
-#else
-#define LSIZE size
-#define LTEXT text
-#define DTYPE char
-#define CONTENT_PART contents.part
-#define CONTENT_MSG_BODY contents.msg.body
-#define IMAPVER "Imap 4"
-#endif
-
-#define PHP_EXPUNGE 32768
-
-/* type casts left out, put here to remove warnings in msvc */
-void rfc822_date(char *date);
-extern char *cpystr (const char *str);
-extern char *cpytxt (SIZEDTEXT *dst, char *text, unsigned long size);
-extern long utf8_mime2text (SIZEDTEXT *src, SIZEDTEXT *dst);
-extern unsigned long find_rightmost_bit (unsigned long *valptr);
-void fs_give (void **block);
-void *fs_get (size_t size);
-static int add_assoc_object(pval *arg, char *key, pval *tmp);
-int add_next_index_object(pval *arg, pval *tmp);
-void _php_make_header_object(zval *myzvalue, ENVELOPE *en);
-void _php_imap_add_body(pval *arg, BODY *body);
-void _php_imap_parse_address(ADDRESS *addresslist, char *fulladdress, pval *paddress);
-int imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char *rpath);
-
-typedef struct php_imap_le_struct {
-	MAILSTREAM *imap_stream;
-	long flags;
-#ifdef OP_RELOGIN
-	/* AJS: busy flag for persistent connections, pointers for chaining */
-	struct php3_imap_le_struct *next;
-	struct php3_imap_le_struct **prev;
-	char busy;
-#endif
-} pils;
-
-typedef struct php_imap_mailbox_struct {
-	SIZEDTEXT text;
-	DTYPE delimiter;
-	long attributes;
-	struct php_imap_mailbox_struct *next;
-} FOBJECTLIST;
-
-typedef struct php_imap_error_struct {
-	SIZEDTEXT text;
-	long errflg;
-	struct php_imap_error_struct *next;
-} ERRORLIST;
-
-
-typedef struct _php_imap_message_struct {
-	unsigned long msgid;
-	struct _php_imap_message_struct *next;
-} MESSAGELIST;
- 
-void mail_close_it (pils *imap_le_struct);
-#ifdef OP_RELOGIN
-/* AJS: close persistent connection */
-void mail_userlogout_it (pils *imap_le_struct);
-void mail_nuke_chain (pils **headp);
-#endif
- 
-function_entry imap_functions[] = {
-	PHP_FE(imap_open,			NULL)
-	PHP_FE(imap_popen,			NULL)
-	PHP_FE(imap_reopen,			NULL)
-	PHP_FE(imap_num_msg,		NULL)
-	PHP_FE(imap_num_recent,		NULL)
-	PHP_FE(imap_headers,		NULL)
-	PHP_FALIAS(imap_header, imap_headerinfo, NULL)
-	PHP_FE(imap_headerinfo,		NULL)
-	PHP_FE(imap_rfc822_parse_headers,	NULL)
-	PHP_FE(imap_body,			NULL)
-	PHP_FE(imap_fetchstructure,	NULL)
-	PHP_FE(imap_fetchbody,		NULL)
-	PHP_FE(imap_expunge,		NULL)
-	PHP_FE(imap_delete,			NULL)
-	PHP_FE(imap_undelete,		NULL)
-	PHP_FE(imap_check,			NULL)
-	PHP_FE(imap_close,			NULL)
-	PHP_FE(imap_mail_copy,		NULL)
-	PHP_FE(imap_mail_move,		NULL)
-	PHP_FE(imap_createmailbox,	NULL)
-	PHP_FE(imap_renamemailbox,	NULL)
-	PHP_FE(imap_deletemailbox,	NULL)
-	PHP_FALIAS(imap_listmailbox, imap_list,	NULL)
-	PHP_FALIAS(imap_getmailboxes, imap_list_full,	NULL)
-	PHP_FALIAS(imap_scanmailbox, imap_listscan,	NULL)
-	PHP_FALIAS(imap_listsubscribed, imap_lsub,	NULL)
-	PHP_FALIAS(imap_getsubscribed, imap_lsub_full,	NULL)
-	PHP_FE(imap_subscribe,		NULL)
-	PHP_FE(imap_unsubscribe,	NULL)
-	PHP_FE(imap_append,			NULL)
-	PHP_FE(imap_ping,			NULL)
-	PHP_FE(imap_base64,			NULL)
-	PHP_FE(imap_qprint,			NULL)
-	PHP_FE(imap_8bit,			NULL)
-	PHP_FE(imap_binary,			NULL)
-	PHP_FE(imap_mailboxmsginfo,	NULL)
-	PHP_FE(imap_rfc822_write_address,		NULL)
-	PHP_FE(imap_rfc822_parse_adrlist,		NULL)
-	PHP_FE(imap_setflag_full,	NULL)
-	PHP_FE(imap_clearflag_full,	NULL)
-	PHP_FE(imap_sort,			NULL)
-	PHP_FE(imap_fetchheader,	NULL)
-	PHP_FALIAS(imap_fetchtext,imap_body,		NULL)
-	PHP_FE(imap_uid,			NULL)
-	PHP_FE(imap_msgno,			NULL)
-	PHP_FE(imap_list,			NULL)
-	PHP_FALIAS(imap_scan,imap_listscan,			NULL)
-	PHP_FE(imap_lsub,			NULL)
-	PHP_FALIAS(imap_create,imap_createmailbox,			NULL)
-	PHP_FALIAS(imap_rename,imap_renamemailbox,			NULL)
-	PHP_FE(imap_status,			NULL)
-	PHP_FE(imap_bodystruct,		NULL)
-	PHP_FE(imap_fetch_overview,	NULL)
-	PHP_FE(imap_mail_compose,	NULL)
-	PHP_FE(imap_alerts,			NULL)
-	PHP_FE(imap_errors,			NULL)
-	PHP_FE(imap_last_error,		NULL)
-#if !(WIN32|WINNT)
-	PHP_FE(imap_mail,           NULL)
-#endif
-	PHP_FE(imap_search,			NULL)
-	PHP_FE(imap_utf7_decode,	NULL)
-	PHP_FE(imap_utf7_encode,	NULL)
-	PHP_FE(imap_utf8,       	NULL)
-	PHP_FE(imap_mime_header_decode,	NULL)
-	{NULL, NULL, NULL}
-};
-
-#ifdef OP_RELOGIN
-#define IS_STREAM(ind_type)     ((ind_type)==le_imap || (ind_type)==le_pimap)
-#else
-#define IS_STREAM(ind_type)     ((ind_type)==le_imap)
-#endif
-
-
-zend_module_entry imap_module_entry = {
-    "imap", imap_functions, PHP_MINIT(imap), NULL, PHP_RINIT(imap), PHP_RSHUTDOWN(imap),PHP_MINFO(imap), STANDARD_MODULE_PROPERTIES
-};
-
-
-#ifdef COMPILE_DL_IMAP
-DLEXPORT zend_module_entry *get_module(void) { return &imap_module_entry; }
-#endif
-
-/* Determines how mm_list() and mm_lsub() are to return their results. */
-typedef enum {
-	FLIST_ARRAY,
-	FLIST_OBJECT
-} folderlist_style_t;
-
-/* 
-   I believe since this global is used ONLY within this module,
-   and nothing will link to this module, we can use the simple 
-   thread local storage
-*/
-int le_imap;
-#ifdef OP_RELOGIN
-/* AJS: persistent connection type, chain pointer type */
-int le_pimap;
-int le_pimapchain;
-#endif
-char imap_user[80]="";
-char imap_password[80]="";
-#if HAVE_IMSP
-extern char imsp_user[80];
-extern char imsp_password[80];
-#endif
-STRINGLIST *imap_folders=NIL;
-STRINGLIST *imap_sfolders=NIL;
-STRINGLIST *imap_alertstack=NIL;
-ERRORLIST *imap_errorstack=NIL;
-MESSAGELIST *imap_messages=NIL;
-FOBJECTLIST *imap_folder_objects=NIL;
-FOBJECTLIST *imap_sfolder_objects=NIL;
-folderlist_style_t folderlist_style = FLIST_ARRAY;
-long status_flags;
-unsigned long status_messages;
-unsigned long status_recent;
-unsigned long status_unseen;
-unsigned long status_uidnext;
-unsigned long status_uidvalidity;
-#ifdef SA_QUOTA
-unsigned long status_quota;
-#endif
-#ifdef SA_QUOTA_ALL
-unsigned long status_quota_all;
-#endif
-
-void
-mail_close_it (pils *imap_le_struct)
-{
-	mail_close_full (imap_le_struct->imap_stream,imap_le_struct->flags);
-	efree(imap_le_struct);
-}
-
-#ifdef OP_RELOGIN
-/* AJS: stream close functions for persistent connections */
-void
-mail_userlogout_it (pils *imap_le_struct)
-{
-	/* Close this user's session, putting the stream back
-	 * into AUTHENTICATE state.  (Note that IMAP does not
-	 * support this behavior... yet)
-	 */
-	imap_le_struct->busy = 0;
-	mail_close_full(imap_le_struct->imap_stream,
-			imap_le_struct->flags | CL_HALF);
-}
-
-void
-mail_nuke_chain (pils **headp)
-{
-	pils		*node, *next;
-
-	for (node = *headp; node; node = next) {
-		next = node->next;
-		mail_close(node->imap_stream);
-		free(node);
-	}
-
-	free(headp);
-}
-#endif
-
-static int add_assoc_object(pval *arg, char *key, pval *tmp)
-{
-	HashTable *symtable;
-	
-	if (arg->type == IS_OBJECT) {
-		symtable = arg->value.obj.properties;
-	} else {
-		symtable = arg->value.ht;
-	}
-	return zend_hash_update(symtable, key, strlen(key)+1, (void *) &tmp, sizeof(pval *), NULL);
-}
-
-/* Mail instantiate FOBJECTLIST
- * Returns: new FOBJECTLIST list
- * Author: CJH
- */
-FOBJECTLIST *mail_newfolderobjectlist (void) {
-  return (FOBJECTLIST *) memset(fs_get(sizeof(FOBJECTLIST)),0,
-				sizeof(FOBJECTLIST));
-}
-
-
-/* Mail garbage collect FOBJECTLIST
- * Accepts: pointer to FOBJECTLIST pointer
- * Author: CJH
- */
-void mail_free_foblist (FOBJECTLIST **foblist)
-{
-  if (*foblist) {		/* only free if exists */
-    if ((*foblist)->text.data) fs_give ((void **) &(*foblist)->text.data);
-    mail_free_foblist (&(*foblist)->next);
-    fs_give ((void **) foblist);	/* return string to free storage */
-  }
-}
-
-
-/* Mail instantiate ERRORLIST
- * Returns: new ERRORLIST list
- * Author: CJH
- */
-ERRORLIST *mail_newerrorlist (void) {
-  return (ERRORLIST *) memset(fs_get(sizeof(ERRORLIST)),0,
-			      sizeof(ERRORLIST));
-}
-
-/* Mail garbage collect FOBJECTLIST
- * Accepts: pointer to FOBJECTLIST pointer
- * Author: CJH
- */
-void mail_free_errorlist (ERRORLIST **errlist)
-{
-  if (*errlist) {		/* only free if exists */
-    if ((*errlist)->text.data) fs_give ((void **) &(*errlist)->text.data);
-    mail_free_errorlist (&(*errlist)->next);
-    fs_give ((void **) errlist);	/* return string to free storage */
-  }
-}
-
-
-/* Author: CJH */
-PHP_RINIT_FUNCTION(imap){
-  imap_errorstack = NIL;
-  imap_alertstack = NIL;
-  return SUCCESS;
-}
-
-/* Author: CJH */
-PHP_RSHUTDOWN_FUNCTION(imap) {
-  ERRORLIST *ecur = NIL;
-  STRINGLIST *acur = NIL;
-  
-  if (imap_errorstack != NIL) {
-    /* output any remaining errors at their original error level */
-    ecur = imap_errorstack;
-    while (ecur != NIL) {
-      php_error(ecur->errflg, ecur->LTEXT);
-      ecur = ecur->next;
-    }
-    mail_free_errorlist(&imap_errorstack);
-  }
-  
-  if (imap_alertstack != NIL) {
-    /* output any remaining alerts at E_NOTICE level */
-    acur = imap_alertstack;
-    while (acur != NIL) {
-      php_error(E_NOTICE, acur->LTEXT);
-      acur = acur->next;
-    }
-    mail_free_stringlist(&imap_alertstack);
-  }
-  
-  return SUCCESS;
-}
-
-inline int add_next_index_object(pval *arg, pval *tmp)
-{
-	HashTable *symtable;
-	
-	if (arg->type == IS_OBJECT) {
-		symtable = arg->value.obj.properties;
-	} else {
-		symtable = arg->value.ht;
-	}
-
-	return zend_hash_next_index_insert(symtable, (void *) &tmp, sizeof(pval *), NULL); 
-}
-
-
-/* Mail instantiate MESSAGELIST
- * Returns: new MESSAGELIST list
- * Author: CJH
- */
-MESSAGELIST *mail_newmessagelist (void)
-{
-	return (MESSAGELIST *) memset(fs_get(sizeof(MESSAGELIST)),0,
-								  sizeof(MESSAGELIST));
-}
-
-/* Mail garbage collect MESSAGELIST
- * Accepts: pointer to MESSAGELIST pointer
- * Author: CJH
- */
-void mail_free_messagelist (MESSAGELIST **msglist)
-{
-	if (*msglist) {		/* only free if exists */
-		mail_free_messagelist (&(*msglist)->next);
-		fs_give ((void **) msglist);	/* return string to free storage */
-	}
-}
-
-
-PHP_MINFO_FUNCTION(imap)
-{
-	php_printf("Imap Support enabled<br>");
-	php_printf("<table>");
-	php_printf("<tr><td>Imap c-client Version:</td>");
-#ifdef IMAP41
-	php_printf("<td>Imap 4.1</td>");
-#else
-	php_printf("<td>Imap 4.0</td>");
-#endif
-	php_printf("</tr></table>");
-}
-
-PHP_MINIT_FUNCTION(imap)
-{
-	unsigned long sa_all =	SA_MESSAGES | SA_RECENT | SA_UNSEEN |
-				SA_UIDNEXT | SA_UIDVALIDITY;
-
-#if !(WIN32|WINNT)
-	mail_link(&unixdriver);   /* link in the unix driver */
-#endif
-	mail_link (&imapdriver);      /* link in the imap driver */
-	mail_link (&nntpdriver);      /* link in the nntp driver */
-	mail_link (&pop3driver);      /* link in the pop3 driver */
-#if !(WIN32|WINNT)
-	mail_link (&mhdriver);        /* link in the mh driver */
-	mail_link (&mxdriver);        /* link in the mx driver */
-#endif
-	mail_link (&mbxdriver);       /* link in the mbx driver */
-	mail_link (&tenexdriver);     /* link in the tenex driver */
-	mail_link (&mtxdriver);       /* link in the mtx driver */
-#if !(WIN32|WINNT)
-	mail_link (&mmdfdriver);      /* link in the mmdf driver */
-	mail_link (&newsdriver);      /* link in the news driver */
-	mail_link (&philedriver);     /* link in the phile driver */
-	auth_link (&auth_log);        /* link in the log authenticator */
-#endif
-	mail_link (&dummydriver);     /* link in the dummy driver */
-	/* lets allow NIL */
-
-	REGISTER_MAIN_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS);
-
-
-	/* Open Options */
-
-	REGISTER_MAIN_LONG_CONSTANT("OP_DEBUG", OP_DEBUG, CONST_PERSISTENT | CONST_CS);
-	/* debug protocol negotiations */
-
-	REGISTER_MAIN_LONG_CONSTANT("OP_READONLY", OP_READONLY, CONST_PERSISTENT | CONST_CS);
-	/* read-only open */
-
-	REGISTER_MAIN_LONG_CONSTANT("OP_ANONYMOUS", OP_ANONYMOUS, CONST_PERSISTENT | CONST_CS);
-	/* anonymous open of newsgroup */
-
-	REGISTER_MAIN_LONG_CONSTANT("OP_SHORTCACHE", OP_SHORTCACHE, CONST_PERSISTENT | CONST_CS);
-
-	/* short (elt-only) caching */
-
-	REGISTER_MAIN_LONG_CONSTANT("OP_SILENT", OP_SILENT, CONST_PERSISTENT | CONST_CS);
-	/* don't pass up events (internal use) */
-	REGISTER_MAIN_LONG_CONSTANT("OP_PROTOTYPE", OP_PROTOTYPE, CONST_PERSISTENT | CONST_CS);
-	/* return driver prototype */
-	REGISTER_MAIN_LONG_CONSTANT("OP_HALFOPEN", OP_HALFOPEN, CONST_PERSISTENT | CONST_CS);
-	/* half-open (IMAP connect but no select) */
-
-	REGISTER_MAIN_LONG_CONSTANT("OP_EXPUNGE", OP_EXPUNGE, CONST_PERSISTENT | CONST_CS);
-	/* silently expunge recycle stream */
-
-	REGISTER_MAIN_LONG_CONSTANT("OP_SECURE", OP_SECURE, CONST_PERSISTENT | CONST_CS);
-	/* don't do non-secure authentication */
-
-	/* 
-	PHP re-assigns CL_EXPUNGE a custom value that can be used as part of the imap_open() bitfield
-	because it seems like a good idea to be able to indicate that the mailbox should be 
-	automatically expunged during imap_open in case the script get interrupted and it doesn't get
-	to the imap_close() where this option is normally placed.  If the c-client library adds other
-	options and the value for this one conflicts, simply make PHP_EXPUNGE higher at the top of 
-	this file 
-	*/
-	REGISTER_MAIN_LONG_CONSTANT("CL_EXPUNGE", PHP_EXPUNGE, CONST_PERSISTENT | CONST_CS);
-	/* expunge silently */
-
-
-	/* Fetch options */
-
-	REGISTER_MAIN_LONG_CONSTANT("FT_UID", FT_UID, CONST_PERSISTENT | CONST_CS);
-	/* argument is a UID */
-	REGISTER_MAIN_LONG_CONSTANT("FT_PEEK", FT_PEEK, CONST_PERSISTENT | CONST_CS);
-	/* peek at data */
-	REGISTER_MAIN_LONG_CONSTANT("FT_NOT", FT_NOT, CONST_PERSISTENT | CONST_CS);
-	/* NOT flag for header lines fetch */
-	REGISTER_MAIN_LONG_CONSTANT("FT_INTERNAL", FT_INTERNAL, CONST_PERSISTENT | CONST_CS);
-	/* text can be internal strings */
-	REGISTER_MAIN_LONG_CONSTANT("FT_PREFETCHTEXT", FT_PREFETCHTEXT, CONST_PERSISTENT | CONST_CS);
-	/* IMAP prefetch text when fetching header */
-
-
-	/* Flagging options */
-
-	REGISTER_MAIN_LONG_CONSTANT("ST_UID", ST_UID, CONST_PERSISTENT | CONST_CS);
-	/* argument is a UID sequence */
-	REGISTER_MAIN_LONG_CONSTANT("ST_SILENT", ST_SILENT, CONST_PERSISTENT | CONST_CS);
-	/* don't return results */
-	REGISTER_MAIN_LONG_CONSTANT("ST_SET", ST_SET, CONST_PERSISTENT | CONST_CS);
-	/* set vs. clear */
-
-	/* Copy options */
-
-	REGISTER_MAIN_LONG_CONSTANT("CP_UID", CP_UID, CONST_PERSISTENT | CONST_CS);
-	/* argument is a UID sequence */
-	REGISTER_MAIN_LONG_CONSTANT("CP_MOVE", CP_MOVE, CONST_PERSISTENT | CONST_CS);
-	/* delete from source after copying */
-
-
-	/* Search/sort options */
-
-	REGISTER_MAIN_LONG_CONSTANT("SE_UID", SE_UID, CONST_PERSISTENT | CONST_CS);
-	/* return UID */
-	REGISTER_MAIN_LONG_CONSTANT("SE_FREE", SE_FREE, CONST_PERSISTENT | CONST_CS);
-	/* free search program after finished */
-	REGISTER_MAIN_LONG_CONSTANT("SE_NOPREFETCH", SE_NOPREFETCH, CONST_PERSISTENT | CONST_CS);
-	/* no search prefetching */
-	REGISTER_MAIN_LONG_CONSTANT("SO_FREE", SO_FREE, CONST_PERSISTENT | CONST_CS);
-	/* free sort program after finished */
-	REGISTER_MAIN_LONG_CONSTANT("SO_NOSERVER", SO_NOSERVER, CONST_PERSISTENT | CONST_CS);
-	/* don't do server-based sort */
-
-	/* Status options */
-
-	REGISTER_MAIN_LONG_CONSTANT("SA_MESSAGES",SA_MESSAGES , CONST_PERSISTENT | CONST_CS);
-	/* number of messages */
-	REGISTER_MAIN_LONG_CONSTANT("SA_RECENT", SA_RECENT, CONST_PERSISTENT | CONST_CS);
-	/* number of recent messages */
-	REGISTER_MAIN_LONG_CONSTANT("SA_UNSEEN",SA_UNSEEN , CONST_PERSISTENT | CONST_CS);
-	/* number of unseen messages */
-	REGISTER_MAIN_LONG_CONSTANT("SA_UIDNEXT", SA_UIDNEXT, CONST_PERSISTENT | CONST_CS);
-	/* next UID to be assigned */
-	REGISTER_MAIN_LONG_CONSTANT("SA_UIDVALIDITY",SA_UIDVALIDITY , CONST_PERSISTENT | CONST_CS);
-	/* UID validity value */
-
-#ifdef SA_QUOTA
-	sa_all |= SA_QUOTA;
-        REGISTER_MAIN_LONG_CONSTANT("SA_QUOTA",SA_QUOTA , CONST_PERSISTENT | CONST_CS);
-     /* Disk space taken up by mailbox. */
-#endif
-#ifdef SA_QUOTA_ALL
-	sa_all |= SA_QUOTA_ALL;
-        REGISTER_MAIN_LONG_CONSTANT("SA_QUOTA_ALL",SA_QUOTA_ALL , CONST_PERSISTENT | CONST_CS);
-     /* Disk space taken up by all mailboxes owned by user. */
-#endif
-	REGISTER_MAIN_LONG_CONSTANT("SA_ALL", sa_all, CONST_PERSISTENT | CONST_CS);
-     /* get all status information */
-		
-
-
-	/* Bits for mm_list() and mm_lsub() */
-
-	REGISTER_MAIN_LONG_CONSTANT("LATT_NOINFERIORS",LATT_NOINFERIORS , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("LATT_NOSELECT", LATT_NOSELECT, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("LATT_MARKED", LATT_MARKED, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("LATT_UNMARKED",LATT_UNMARKED , CONST_PERSISTENT | CONST_CS);
-
-
-	/* Sort functions */
-
-	REGISTER_MAIN_LONG_CONSTANT("SORTDATE",SORTDATE , CONST_PERSISTENT | CONST_CS);
-	/* date */
-	REGISTER_MAIN_LONG_CONSTANT("SORTARRIVAL",SORTARRIVAL , CONST_PERSISTENT | CONST_CS);
-	/* arrival date */
-	REGISTER_MAIN_LONG_CONSTANT("SORTFROM",SORTFROM , CONST_PERSISTENT | CONST_CS);
-	/* from */
-	REGISTER_MAIN_LONG_CONSTANT("SORTSUBJECT",SORTSUBJECT , CONST_PERSISTENT | CONST_CS);
-	/* subject */
-	REGISTER_MAIN_LONG_CONSTANT("SORTTO",SORTTO , CONST_PERSISTENT | CONST_CS);
-	/* to */
-	REGISTER_MAIN_LONG_CONSTANT("SORTCC",SORTCC , CONST_PERSISTENT | CONST_CS);
-	/* cc */
-	REGISTER_MAIN_LONG_CONSTANT("SORTSIZE",SORTSIZE , CONST_PERSISTENT | CONST_CS);
-	/* size */
-
-	REGISTER_MAIN_LONG_CONSTANT("TYPETEXT",TYPETEXT , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("TYPEMULTIPART",TYPEMULTIPART , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("TYPEMESSAGE",TYPEMESSAGE , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("TYPEAPPLICATION",TYPEAPPLICATION , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("TYPEAUDIO",TYPEAUDIO , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("TYPEIMAGE",TYPEIMAGE , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("TYPEVIDEO",TYPEVIDEO , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("TYPEOTHER",TYPEOTHER , CONST_PERSISTENT | CONST_CS);
-	/*      TYPETEXT                unformatted text
-	TYPEMULTIPART           multiple part
-	TYPEMESSAGE             encapsulated message
-	TYPEAPPLICATION         application data
-	TYPEAUDIO               audio
-	TYPEIMAGE               static image (GIF, JPEG, etc.)
-	TYPEVIDEO               video
-	TYPEOTHER               unknown
-	*/
-	REGISTER_MAIN_LONG_CONSTANT("ENC7BIT",ENC7BIT , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("ENC8BIT",ENC8BIT , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("ENCBINARY",ENCBINARY , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("ENCBASE64",ENCBASE64, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("ENCQUOTEDPRINTABLE",ENCQUOTEDPRINTABLE , CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("ENCOTHER",ENCOTHER , CONST_PERSISTENT | CONST_CS);
-	/*
-	ENC7BIT                 7 bit SMTP semantic data
-	ENC8BIT                 8 bit SMTP semantic data
-	ENCBINARY               8 bit binary data
-	ENCBASE64               base-64 encoded data
-	ENCQUOTEDPRINTABLE      human-readable 8-as-7 bit data
-	ENCOTHER                unknown
-	*/
-
-    le_imap = register_list_destructors(mail_close_it,NULL);
-#ifdef OP_RELOGIN
-    /* AJS: destructors for persistent connections */
-    le_pimap = register_list_destructors(mail_userlogout_it, NULL);
-    le_pimapchain = register_list_destructors(NULL, mail_nuke_chain);
-#endif
-	return SUCCESS;
-}
-
-/* {{{ proto int imap_open(string mailbox, string user, string password [, int options])
-   Open an IMAP stream to a mailbox */
-void imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
-{
-	pval *mailbox;
-	pval *user;
-	pval *passwd;
-	pval *options;
-	MAILSTREAM *imap_stream;
-	pils *imap_le_struct;
-	long flags=NIL;
-	long cl_flags=NIL;
-	
-#ifdef OP_RELOGIN
-	NETMBX netmbx;
-	char *hashed_details = NULL;
-	int hashed_details_length = 0;
-#endif
-	int ind;
-        int myargc=ARG_COUNT(ht);
-	
-	if (myargc <3 || myargc >4 || getParameters(ht, myargc, &mailbox,&user,&passwd,&options) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_string(mailbox);
-	convert_to_string(user);
-	convert_to_string(passwd);
-	if(myargc ==4) {
-		convert_to_long(options);
-		flags = options->value.lval;
-		if(flags & PHP_EXPUNGE) {
-			cl_flags = CL_EXPUNGE;
-			flags ^= PHP_EXPUNGE;
-		}
-	}
-	strcpy(imap_user,user->value.str.val);
-	strcpy(imap_password,passwd->value.str.val);
-
-#ifdef OP_RELOGIN
-	/* AJS: persistent connection handling */
-	/* Cannot use a persistent connection if we cannot parse
-	 * out the server's hostname.
-	 */
-	if (	persistent &&
-		!mail_valid_net_parse(mailbox->value.str.val, &netmbx))
-	{
-		persistent = 0;
-	}
-
-	imap_stream = NIL;
-	if (persistent) {
-		list_entry	*le = NULL;
-		list_entry	new_le;
-		pils		**headp, *node;
-		int		need_update = 0;
-
-		hashed_details_length = sizeof("imap_") + strlen(netmbx.host);
-		hashed_details = (char*) emalloc(hashed_details_length);
-		sprintf(hashed_details, "imap_%s", netmbx.host);
-
-		/* Check for an existing connection. */
-		if (	(zend_hash_find(&EG(persistent_list),
-					hashed_details,
-					hashed_details_length,
-					(void*) &le) == FAILURE) ||
-			(le->type != le_pimapchain))
-		{
-			le = NULL;
-		}
-
-		/* Re-use existing connection if available. */
-		node = NULL;
-		headp = NULL;
-		if (le) {
-			headp = (pils**) le->ptr;
-
-			/* find a non-busy connection */
-			for (node=*headp; node; node=node->next)
-				if (!node->busy)
-					break;
-		}
-
-		/* If we found a node, do a relogin.  */
-		if (node) {
-			imap_stream = mail_open(
-				node->imap_stream,
-				mailbox->value.str.val,
-				flags | OP_RELOGIN);
-			if (imap_stream) {
-				/* Ping the stream to see if it is
-				 * still good. 
-				 */
-				if (!mail_ping(imap_stream)) {
-					mail_close(imap_stream);
-					imap_stream = NIL;
-				}
-			}
-		}
-
-		/* Get a fresh stream if we don't have one yet. */
-		if (imap_stream == NIL) {
-			/* Open a new connection. */
-			imap_stream = mail_open(
-				NIL,
-				mailbox->value.str.val,
-				flags | OP_RELOGIN);
-		}
-
-		/* Do we have a stream yet?  If not, bail. */
-		if (imap_stream == NIL) {
-			if (node) {
-				/* unlink the node */
-				if ((*node->prev = node->next))
-					node->next->prev = node->prev;
-				free(node);
-				/* delete the hash entry if empty */
-				if (*headp == NULL)
-					zend_hash_del(&EG(persistent_list),
-						hashed_details,
-						hashed_details_length);
- 			}
-			efree(hashed_details);
-			RETURN_FALSE;
-		}
-
-		/* Allocate a new node if none. */
-		if (node == NULL) {
-			/* Alloc new hash entry. */
-			node = malloc(sizeof(pils));
-			if (node == NULL) {
-				efree(hashed_details);
-				RETURN_FALSE;
-			}
-
-			/* Allocate headp if it does not exist. */
-			if (headp == NULL) {
-				headp = calloc(1, sizeof(*headp));
-				need_update = 1;
-			}
-
-			node->prev = headp;
-			node->next = *headp;
-			*headp = node;
-		}
-
-
-		/* Initialize the node. */
-		node->busy = 1;
-		node->imap_stream = imap_stream;
-		node->flags = cl_flags;
-
-		/* Update the hash. */
-		new_le.type = le_pimapchain;
-		new_le.ptr = headp;
-		if (	need_update &&
-			zend_hash_update(&EG(persistent_list), hashed_details,
-				hashed_details_length, &new_le,
-				sizeof(new_le), NULL) == FAILURE)
-		{
-			/* unlink and free the new node */
-			if ((*node->prev = node->next))
-				node->next->prev = node->prev;
-			mail_close(node->imap_stream);
-			free(node);
-
-			free(headp);
-			efree(hashed_details);
- 			RETURN_FALSE;
-		}
-
-		efree(hashed_details);
-
-		imap_le_struct = node;
-	}
-	else {
-#endif
-		imap_stream = mail_open(NIL, mailbox->value.str.val, flags);
-		if (imap_stream == NIL) {
-			php_error(E_WARNING,
-				"Couldn't open stream %s\n",
-				mailbox->value.str.val);
-			RETURN_FALSE;
-		}
-
-		imap_le_struct = emalloc(sizeof(pils));
-		imap_le_struct->imap_stream = imap_stream;
-		imap_le_struct->flags = cl_flags;	
-#ifdef OP_RELOGIN
-	}
-
-	if (persistent)
-		ind = zend_list_insert(imap_le_struct, le_pimap);
-	else
-#endif
-		ind = zend_list_insert(imap_le_struct, le_imap);
-
-	RETURN_LONG(ind);
-}
-
-/* {{{ proto int imap_open(string mailbox, string user, string password [, int options])
-   Open an IMAP stream to a mailbox */
-PHP_FUNCTION(imap_open)
-{
-	imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-}
-/* }}} */
-
-/* {{{ proto int imap_popen(string mailbox, string user, string password [, int options])
-   Open an IMAP stream to a mailbox */
-PHP_FUNCTION(imap_popen)
-{
-#ifdef OP_RELOGIN
-	return imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
-#else
-	php_error(E_WARNING, "Persistent IMAP connections are not yet supported.\n");
-	RETURN_FALSE;
-#endif
-}
-/* }}} */
-
-/* {{{ proto int imap_reopen(int stream_id, string mailbox [, int options])
-   Reopen IMAP stream to new mailbox */
-PHP_FUNCTION(imap_reopen)
-{
-	pval *streamind;
-	pval *mailbox;
-	pval *options;
-	MAILSTREAM *imap_stream;
-	pils *imap_le_struct; 
-	int ind, ind_type;
-	long flags=NIL;
-	long cl_flags=NIL;
-	int myargc=ARG_COUNT(ht);
-
-	if (myargc<2 || myargc>3 || getParameters(ht,myargc,&streamind, &mailbox, &options) == FAILURE) {
-        WRONG_PARAM_COUNT;
-    }
-
-	convert_to_long(streamind);
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-
-	convert_to_string(mailbox);
-	if(myargc == 3) {
-		convert_to_long(options);
-		flags = options->value.lval;
-		if(flags & PHP_EXPUNGE) {
-			cl_flags = CL_EXPUNGE;
-			flags ^= PHP_EXPUNGE;
-		}
-		imap_le_struct->flags = cl_flags;	
-	}
-	imap_stream = mail_open(imap_le_struct->imap_stream, mailbox->value.str.val, flags);
-	if (imap_stream == NIL) {
-		php_error(E_WARNING,"Couldn't re-open stream\n");
-		RETURN_FALSE;
-	}
-	imap_le_struct->imap_stream = imap_stream;
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int imap_append(int stream_id, string folder, string message [, string flags])
-   Append a string message to a specified mailbox */
-PHP_FUNCTION(imap_append)
-{
-	pval *streamind,*folder, *message,*flags;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-	STRING st;
-	int myargc=ARG_COUNT(ht);
-  
-	if ( myargc < 3 || myargc > 4 || getParameters( ht, myargc, &streamind, &folder, &message,&flags) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-  
-	convert_to_long(streamind);
-	convert_to_string(folder);
-	convert_to_string(message);
-	if (myargc == 4) convert_to_string(flags);
-	ind = streamind->value.lval;
-  
-	imap_le_struct = (pils *)zend_list_find( ind, &ind_type );
-
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	INIT (&st,mail_string,(void *) message->value.str.val,message->value.str.len);
-	if(mail_append_full(imap_le_struct->imap_stream, folder->value.str.val,myargc==4?flags->value.str.val:NIL,NIL,&st)) {
-		RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-
-/* }}} */
-
-/* {{{ proto int imap_num_msg(int stream_id)
-   Gives the number of messages in the current mailbox */
-PHP_FUNCTION(imap_num_msg)
-{
-	pval *streamind;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &streamind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-
-	RETURN_LONG(imap_le_struct->imap_stream->nmsgs);
-}
-/* }}} */
-
-/* {{{ proto int imap_ping(int stream_id)
-   Check if the IMAP stream is still active */
-PHP_FUNCTION(imap_ping)
-{
-	pval *streamind;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &streamind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long( streamind );
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find( ind, &ind_type );
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error( E_WARNING, "Unable to find stream pointer" );
-		RETURN_FALSE;
-	}
-	RETURN_LONG( mail_ping( imap_le_struct->imap_stream ) );
-}
-/* }}} */
-
-/* {{{ proto int imap_num_recent(int stream_id)
-   Gives the number of recent messages in current mailbox */
-PHP_FUNCTION(imap_num_recent)
-{
-	pval *streamind;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &streamind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(streamind);
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	RETURN_LONG(imap_le_struct->imap_stream->recent);
-}
-/* }}} */
-
-/* {{{ proto int imap_expunge(int stream_id)
-   Delete all messages marked for deletion */
-PHP_FUNCTION(imap_expunge)
-{
-	pval *streamind;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &streamind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-
-	mail_expunge (imap_le_struct->imap_stream);
-
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int imap_close(int stream_id [, int options])
-   Close an IMAP stream */
-PHP_FUNCTION(imap_close)
-{
-	pval *options, *streamind;
-	int ind, ind_type;
-	pils *imap_le_struct=NULL; 
-	int myargcount=ARG_COUNT(ht);
-	long flags = NIL;
-
-	if (myargcount < 1 || myargcount > 2 || getParameters(ht, myargcount, &streamind, &options) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(streamind);
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-    }
-	if(myargcount==2) {
-		convert_to_long(options);
-		flags = options->value.lval;
-		/* Do the translation from PHP's internal PHP_EXPUNGE define to c-client's CL_EXPUNGE */
-		if(flags & PHP_EXPUNGE) {
-			flags ^= PHP_EXPUNGE;
-			flags |= CL_EXPUNGE;
-		}	
-		imap_le_struct->flags = flags;
-	}
-	zend_list_delete(ind);
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto array imap_headers(int stream_id)
-   Returns headers for all messages in a mailbox */
-PHP_FUNCTION(imap_headers)
-{
-	pval *streamind;
-	int ind, ind_type;
-	unsigned long i;
-	char *t;
-	unsigned int msgno;
-	pils *imap_le_struct; 
-	char tmp[MAILTMPLEN];
-	
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &streamind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_long(streamind);
-	
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	
-	/* Initialize return array */
-	if (array_init(return_value) == FAILURE) {
-		RETURN_FALSE;
-	}
-	
-	for (msgno = 1; msgno <= imap_le_struct->imap_stream->nmsgs; msgno++) {
-		MESSAGECACHE * cache = mail_elt (imap_le_struct->imap_stream,msgno);
-		mail_fetchstructure(imap_le_struct->imap_stream,msgno,NIL);
-		tmp[0] = cache->recent ? (cache->seen ? 'R': 'N') : ' ';
-		tmp[1] = (cache->recent | cache->seen) ? ' ' : 'U';
-		tmp[2] = cache->flagged ? 'F' : ' ';
-		tmp[3] = cache->answered ? 'A' : ' ';
-		tmp[4] = cache->deleted ? 'D' : ' ';
-		tmp[5] = cache->draft ? 'X' : ' ';
-		sprintf(tmp+5, "%4ld) ", cache->msgno);
-		mail_date(tmp+11,cache);
-		tmp[17] = ' ';
-		tmp[18] = '\0';
-		mail_fetchfrom(tmp+18,imap_le_struct->imap_stream,msgno, (long) 20);
-		strcat(tmp," ");
-		if ((i = cache->user_flags)) {
-			strcat(tmp, "{");
-			while (i) {
-				strcat(tmp,imap_le_struct->imap_stream->user_flags[find_rightmost_bit (&i)]);
-				if (i) strcat(tmp," ");
-			}
-			strcat(tmp,"} ");
-		}
-		mail_fetchsubject(t=tmp+strlen(tmp),imap_le_struct->imap_stream,msgno,(long)25);
-		sprintf(t+=strlen(t)," (%ld chars)",cache->rfc822_size);
-		add_next_index_string(return_value,tmp,1);
-	}
-}
-/* }}} */
-
-/* {{{ proto string imap_body(int stream_id, int msg_no [, int options])
-   Read the message body */
-PHP_FUNCTION(imap_body)
-{
-	pval *streamind, * msgno, *flags;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-	int myargc=ARG_COUNT(ht);
-	if (myargc <2 || myargc > 3 || getParameters(ht,myargc,&streamind,&msgno,&flags) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_long(msgno);
-	if(myargc == 3) convert_to_long(flags);
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	RETVAL_STRING(mail_fetchtext_full (imap_le_struct->imap_stream,msgno->value.lval,NIL,myargc == 3 ? flags->value.lval : NIL),1);
-}
-/* }}} */
-
-
-/* {{{ proto string imap_fetchtext_full(int stream_id, int msg_no [, int options])
-   Read the body of a message */
-PHP_FUNCTION(imap_fetchtext_full)
-{
-	pval *streamind, * msgno, *flags;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-	int myargcount = ARG_COUNT(ht);
-	if (myargcount >3 || myargcount <2 || getParameters(ht,myargcount,&streamind,&msgno,&flags) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_long(msgno);
-	if (myargcount == 3) convert_to_long(flags);
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	RETVAL_STRING(mail_fetchtext_full (imap_le_struct->imap_stream,msgno->value.lval,NIL,myargcount==3?flags->value.lval:NIL),1);
-}
-/* }}} */
-
-/* {{{ proto int imap_mail_copy(int stream_id, int msg_no, string mailbox [, int options])
-   Copy specified message to a mailbox */
-PHP_FUNCTION(imap_mail_copy)
-{
-	pval *streamind,*seq, *folder, *options;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-	int myargcount = ARG_COUNT(ht);
-	if (myargcount > 4 || myargcount < 3 
-		|| getParameters(ht,myargcount,&streamind,&seq,&folder,&options) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(seq);
-	convert_to_string(folder);
-	if(myargcount == 4) convert_to_long(options);
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	if ( mail_copy_full(imap_le_struct->imap_stream,seq->value.str.val,folder->value.str.val,myargcount == 4 ? options->value.lval : NIL)==T ) {
-        RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto int imap_mail_move(int stream_id, int msg_no, string mailbox [, int options])
-   Move specified message to a mailbox */
-PHP_FUNCTION(imap_mail_move)
-{
-	pval *streamind,*seq, *folder, *options;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-	int myargcount = ARG_COUNT(ht);
-	if (myargcount > 4 || myargcount < 3 
-		|| getParameters(ht,myargcount,&streamind,&seq,&folder,&options) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(seq);
-	convert_to_string(folder);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	if ( mail_copy_full(imap_le_struct->imap_stream,seq->value.str.val,folder->value.str.val,myargcount == 4 ? ( options->value.lval | CP_MOVE ) : CP_MOVE )==T ) {
-        RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto int imap_createmailbox(int stream_id, string mailbox)
-   Create a new mailbox */
-PHP_FUNCTION(imap_createmailbox)
-{
-	pval *streamind, *folder;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-
-	if (ARG_COUNT(ht)!=2 || getParameters(ht,2,&streamind,&folder) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(folder);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	if ( mail_create(imap_le_struct->imap_stream,folder->value.str.val)==T ) {
-        RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto int imap_renamemailbox(int stream_id, string old_name, string new_name)
-   Rename a mailbox */
-PHP_FUNCTION(imap_renamemailbox)
-{
-	pval *streamind, *old, *new;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-
-	if (ARG_COUNT(ht)!=3 || getParameters(ht,3,&streamind,&old,&new)==FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(old);
-	convert_to_string(new);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	if ( mail_rename(imap_le_struct->imap_stream,old->value.str.val,new->value.str.val)==T ) {
-        RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto int imap_deletemailbox(int stream_id, string mailbox)
-   Delete a mailbox */
-PHP_FUNCTION(imap_deletemailbox)
-{
-	pval *streamind, *folder;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-
-	if (ARG_COUNT(ht)!=2 || getParameters(ht,2,&streamind,&folder) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(folder);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	if ( mail_delete(imap_le_struct->imap_stream,folder->value.str.val)==T ) {
-        RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto array imap_list(int stream_id, string ref, string pattern)
-   Read the list of mailboxes */
-PHP_FUNCTION(imap_list)
-{
-	pval *streamind, *ref, *pat;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-	STRINGLIST *cur=NIL;
-
-	/* set flag for normal, old mailbox list */
-	folderlist_style = FLIST_ARRAY;
-	
-	if (ARG_COUNT(ht)!=3 
-		|| getParameters(ht,3,&streamind,&ref,&pat) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(ref);
-	convert_to_string(pat);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-    imap_folders = NIL;
-	mail_list(imap_le_struct->imap_stream,ref->value.str.val,pat->value.str.val);
-	if (imap_folders == NIL) {
-		RETURN_FALSE;
-	}
-	array_init(return_value);
-    cur=imap_folders;
-    while (cur != NIL ) {
-		add_next_index_string(return_value,cur->LTEXT,1);
-        cur=cur->next;
-    }
-	mail_free_stringlist (&imap_folders);
-}
-
-/* }}} */
-
-/* {{{ proto array imap_getmailboxes(int stream_id, string ref, string pattern)
-   Reads the list of mailboxes and returns a full array of objects containing name, attributes, and delimiter */
-/* Author: CJH */
-PHP_FUNCTION(imap_list_full)
-{
-	pval *streamind, *ref, *pat, *mboxob;
-	int ind, ind_type;
-	pils *imap_le_struct; 
-	FOBJECTLIST *cur=NIL;
-	char *delim=NIL;
-	
-	/* set flag for new, improved array of objects mailbox list */
-	folderlist_style = FLIST_OBJECT;
-	
-	if (ARG_COUNT(ht)!=3 
-		|| getParameters(ht,3,&streamind,&ref,&pat) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_long(streamind);
-	convert_to_string(ref);
-	convert_to_string(pat);
-	
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	
-	imap_folder_objects = NIL;
-	mail_list(imap_le_struct->imap_stream,ref->value.str.val,pat->value.str.val);
-	if (imap_folder_objects == NIL) {
-		RETURN_FALSE;
-	}
-	
-	array_init(return_value);
-	delim = emalloc(2 * sizeof(char));
-	cur=imap_folder_objects;
-	while (cur != NIL) {
-		MAKE_STD_ZVAL(mboxob);
-		object_init(mboxob);
-		add_property_string(mboxob, "name", cur->LTEXT,1);
-		add_property_long(mboxob, "attributes", cur->attributes);
-#ifdef IMAP41
-		delim[0] = (char)cur->delimiter;
-		delim[1] = 0;
-		add_property_string(mboxob, "delimiter", delim, 1);
-#else
-		add_property_string(mboxob, "delimiter", cur->delimiter, 1);
-#endif
-		add_next_index_object(return_value, mboxob);
-		cur=cur->next;
-	}
-	mail_free_foblist(&imap_folder_objects);
-	efree(delim);
-	folderlist_style = FLIST_ARRAY;		/* reset to default */
-}
-
-/* }}} */
-
-/* {{{ proto array imap_scan(int stream_id, string ref, string pattern, string content)
-   Read list of mailboxes containing a certain string */
-PHP_FUNCTION(imap_listscan)
-{
-	pval *streamind, *ref, *pat, *content;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	STRINGLIST *cur=NIL;
-
-	if (ARG_COUNT(ht)!=4 || getParameters(ht,4,&streamind,&ref,&pat,&content) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(ref);
-	convert_to_string(pat);
-	convert_to_string(content);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	imap_folders = NIL;
-	mail_scan(imap_le_struct->imap_stream,ref->value.str.val,pat->value.str.val,content->value.str.val);
-	if (imap_folders == NIL) {
-		RETURN_FALSE;
-	}
-	array_init(return_value);
-	cur=imap_folders;
-	while (cur != NIL ) {
-		add_next_index_string(return_value,cur->LTEXT,1);
-		cur=cur->next;
-	}
-	mail_free_stringlist (&imap_folders);
-}
-
-/* }}} */
-
-/* {{{ proto object imap_check(int stream_id)
-   Get mailbox properties */
-PHP_FUNCTION(imap_check)
-{
-	pval *streamind;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	char date[100];
-
-	if (ARG_COUNT(ht)!=1 || getParameters(ht,1,&streamind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-
-	if (mail_ping (imap_le_struct->imap_stream) == NIL ) {
-		RETURN_FALSE;
-    }
-	if (imap_le_struct->imap_stream && imap_le_struct->imap_stream->mailbox) {
-		rfc822_date (date);
-		object_init(return_value);
-		add_property_string(return_value,"Date",date,1);
-		add_property_string(return_value,"Driver",imap_le_struct->imap_stream->dtb->name,1);
-		add_property_string(return_value,"Mailbox",imap_le_struct->imap_stream->mailbox,1);
-		add_property_long(return_value,"Nmsgs",imap_le_struct->imap_stream->nmsgs);
-		add_property_long(return_value,"Recent",imap_le_struct->imap_stream->recent);
-	} else {
-		RETURN_FALSE;
-	}
-}
-
-/* }}} */
-
-/* {{{ proto int imap_delete(int stream_id, int msg_no [, int flags])
-   Mark a message for deletion */
-PHP_FUNCTION(imap_delete)
-{
-	pval *streamind, *sequence, *flags;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	int myargc=ARG_COUNT(ht);
-
-	if (myargc < 2 || myargc > 3 || getParameters(ht,myargc,&streamind,&sequence,&flags) == FAILURE) {
-	  WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(sequence);
-	if(myargc==3) convert_to_long(flags);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-
-	mail_setflag_full(imap_le_struct->imap_stream,sequence->value.str.val, "\\DELETED", myargc == 3 ? flags->value.lval : NIL);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int imap_undelete(int stream_id, int msg_no)
-   Remove the delete flag from a message */
-PHP_FUNCTION(imap_undelete)
-{
-	pval *streamind, * sequence, *flags;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	int myargc=ARG_COUNT(ht);
-
-	if ( myargc < 2 || myargc > 3 || getParameters(ht,myargc,&streamind,&sequence,&flags) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(streamind);
-	convert_to_string(sequence);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-
-	mail_clearflag_full(imap_le_struct->imap_stream,sequence->value.str.val,"\\DELETED",myargc == 3 ? flags->value.lval : NIL);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-   Read the header of the message */
-PHP_FUNCTION(imap_headerinfo)
-{
-	pval *streamind, *msgno, *fromlength, *subjectlength, *defaulthost;
-	int ind, ind_type;
-	unsigned long length;
-	pils *imap_le_struct;
-	MESSAGECACHE *cache;
-	char *mystring;
-	char dummy[2000];
-	ENVELOPE *en;
-	char fulladdress[MAILTMPLEN];
-	
-	int myargc = ARG_COUNT(ht);
-	if (myargc < 2 || myargc > 5 || getParameters(ht,myargc,&streamind,&msgno,&fromlength,&subjectlength,&defaulthost)==FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_long(streamind);
-	convert_to_long(msgno);
-	if (myargc >= 3) convert_to_long(fromlength); else fromlength = 0x00;
-	if (myargc >= 4) convert_to_long(subjectlength); else subjectlength = 0x00;
-	if (myargc == 5) convert_to_string(defaulthost);
-	
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	
-	if (!msgno->value.lval || msgno->value.lval < 1 || msgno->value.lval > imap_le_struct->imap_stream->nmsgs) {
-		php_error(E_WARNING, "Bad message number");
-	}
-	if (mail_fetchstructure(imap_le_struct->imap_stream, msgno->value.lval, NIL)) {
-		cache = mail_elt(imap_le_struct->imap_stream, msgno->value.lval);
-	} else {
-		RETURN_FALSE;
-	}
-	
-    mystring = mail_fetchheader_full(imap_le_struct->imap_stream, msgno->value.lval, NIL, &length, NIL);
-	if (myargc == 5) {
-		rfc822_parse_msg(&en, NULL, mystring, length, NULL, defaulthost->value.str.val, NIL);
-	} else {
-		rfc822_parse_msg(&en, NULL, mystring, length, NULL, "UNKNOWN", NIL);
-	}
-	
-	/* 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);
-	
-	/* now run through properties that are only going to be returned
-       from a server, not text headers */
-	add_property_string(return_value, "Recent", cache->recent ? (cache->seen ? "R": "N") : " ", 1);
-	add_property_string(return_value, "Unseen", (cache->recent | cache->seen) ? " " : "U", 1);
-	add_property_string(return_value, "Flagged", cache->flagged ? "F" : " ", 1);
-	add_property_string(return_value, "Answered", cache->answered ? "A" : " ", 1);
-	add_property_string(return_value, "Deleted", cache->deleted ? "D" : " ", 1);
-	add_property_string(return_value, "Draft", cache->draft ? "X" : " ", 1);
-	
-	sprintf(dummy, "%4ld", cache->msgno);
-	add_property_string(return_value, "Msgno", dummy, 1);
-	
-	mail_date(dummy, cache);
-	add_property_string(return_value, "MailDate", dummy, 1);
-	
-	sprintf(dummy, "%ld", cache->rfc822_size); 
-	add_property_string(return_value, "Size", dummy, 1);
-	
-	add_property_long(return_value, "udate", mail_longdate(cache));
-	
-	if (en->from && fromlength) {
-		fulladdress[0] = 0x00;
-		mail_fetchfrom(fulladdress, imap_le_struct->imap_stream, msgno->value.lval, fromlength->value.lval);
-		add_property_string(return_value, "fetchfrom", fulladdress, 1);
-	}
-	if (en->subject && subjectlength) {
-		fulladdress[0] = 0x00;
-		mail_fetchsubject(fulladdress, imap_le_struct->imap_stream, msgno->value.lval, subjectlength->value.lval);
-		add_property_string(return_value, "fetchsubject", fulladdress, 1);
-	}
-}
-/* }}} */
-
-/* {{{ proto object imap_rfc822_parse_headers(string headers, string [default_host])
-   Parse a set of mail headers contained in a string, and return an object similar to imap_headerinfo() */
-PHP_FUNCTION(imap_rfc822_parse_headers)
-{
-	zval **headers, **defaulthost;
-	ENVELOPE *en;
-	
-	int myargc = ARG_COUNT(ht);
-	if (myargc < 1 || myargc > 2 || zend_get_parameters_ex(myargc, &headers, &defaulthost) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_string_ex(headers);
-	if (myargc == 2) convert_to_string_ex(defaulthost);
-	
-	if (myargc == 5) {
-		rfc822_parse_msg(&en, NULL, (*headers)->value.str.val, (*headers)->value.str.len, NULL, (*defaulthost)->value.str.val, NIL);
-	} else {
-		rfc822_parse_msg(&en, NULL, (*headers)->value.str.val, (*headers)->value.str.len, NULL, "UNKNOWN", NIL);
-	}
-	
-	/* 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);
-}
-/* }}} */
-
-/* KMLANG */
-/* {{{ proto array imap_lsub(int stream_id, string ref, string pattern)
-   Return a list of subscribed mailboxes */
-PHP_FUNCTION(imap_lsub)
-{
-	pval *streamind, *ref, *pat;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	STRINGLIST *cur=NIL;
-
-	
-	/* set flag for normal, old mailbox list */
-	folderlist_style = FLIST_ARRAY;
-	
-	if (ARG_COUNT(ht)!=3 || getParameters(ht,3,&streamind,&ref,&pat) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(ref);
-	convert_to_string(pat);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	imap_sfolders = NIL;
-	mail_lsub(imap_le_struct->imap_stream,ref->value.str.val,pat->value.str.val);
-	if (imap_sfolders == NIL) {
-		RETURN_FALSE;
-	}
-	array_init(return_value);
-	cur=imap_sfolders;
-	while (cur != NIL ) {
-		add_next_index_string(return_value,cur->LTEXT,1);
-		cur=cur->next;
-	}
-	mail_free_stringlist (&imap_sfolders);
-}
-/* }}} */
-
-/* {{{ proto array imap_getsubscribed(int stream_id, string ref, string pattern)
-   Return a list of subscribed mailboxes */
-/* Author: CJH */
-PHP_FUNCTION(imap_lsub_full)
-{
-	pval *streamind, *ref, *pat, *mboxob;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	FOBJECTLIST *cur=NIL;
-	char *delim=NIL;
-	
-	delim = emalloc(2 * sizeof(char));
-	
-	/* set flag for new, improved array of objects list */
-	folderlist_style = FLIST_OBJECT;
-	
-	if (ARG_COUNT(ht)!=3 || getParameters(ht,3,&streamind,&ref,&pat) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_long(streamind);
-	convert_to_string(ref);
-	convert_to_string(pat);
-	
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	
-	imap_sfolder_objects = NIL;
-	mail_lsub(imap_le_struct->imap_stream,ref->value.str.val,pat->value.str.val);
-	if (imap_sfolder_objects == NIL) {
-		RETURN_FALSE;
-	}
-	
-	array_init(return_value);
-	cur=imap_sfolder_objects;
-	while (cur != NIL ) {
-		MAKE_STD_ZVAL(mboxob);
-		object_init(mboxob);
-		add_property_string(mboxob, "name", cur->LTEXT, 1);
-		add_property_long(mboxob, "attributes", cur->attributes);
-#ifdef IMAP41
-		delim[0] = (char)cur->delimiter;
-		delim[1] = 0;
-		add_property_string(mboxob, "delimiter", delim, 1);
-#else
-		add_property_string(mboxob, "delimiter", cur->delimiter, 1);
-#endif
-		add_next_index_object(return_value, mboxob);
-		cur=cur->next;
-	}
-	mail_free_foblist (&imap_sfolder_objects);
-	efree(delim);
-	folderlist_style = FLIST_ARRAY; // reset to default
-}
-/* }}} */
-
-/* {{{ proto int imap_subscribe(int stream_id, string mailbox)
-   Subscribe to a mailbox */
-PHP_FUNCTION(imap_subscribe)
-{
-	pval *streamind, *folder;
-	int ind, ind_type;
-	pils *imap_le_struct;
-
-	if (ARG_COUNT(ht)!=2 || getParameters(ht,2,&streamind,&folder) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(folder);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	if ( mail_subscribe(imap_le_struct->imap_stream,folder->value.str.val)==T ) {
-		RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto int imap_unsubscribe(int stream_id, string mailbox)
-   Unsubscribe from a mailbox */
-PHP_FUNCTION(imap_unsubscribe)
-{
-	pval *streamind, *folder;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	int myargc=ARG_COUNT(ht);
-	if (myargc !=2 || getParameters(ht,myargc,&streamind,&folder) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-	convert_to_string(folder);
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	if ( mail_unsubscribe(imap_le_struct->imap_stream,folder->value.str.val)==T ) {
-		RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto object imap_fetchstructure(int stream_id, int msg_no [, int options])
-   Read the full structure of a message */
-PHP_FUNCTION(imap_fetchstructure)
-{
-	pval *streamind, *msgno,*flags;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	BODY *body;
-	int myargc=ARG_COUNT(ht);
-	if ( myargc < 2  || myargc > 3 || getParameters( ht, myargc, &streamind, &msgno ,&flags) == FAILURE ) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_long( streamind );
-	convert_to_long( msgno );
-	if (msgno->value.lval < 1) {
-		RETURN_FALSE;
-	}
-	if(myargc == 3) convert_to_long(flags);
-	object_init(return_value);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find( ind, &ind_type );
-
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error( E_WARNING, "Unable to find stream pointer" );
-		RETURN_FALSE;
-	}
-	
-	mail_fetchstructure_full( imap_le_struct->imap_stream, msgno->value.lval, &body ,myargc == 3 ? flags->value.lval : NIL);
-	
-	if (!body) {
-		php_error( E_WARNING, "No body information available" );
-		RETURN_FALSE;
-	}
-	
-	_php_imap_add_body(return_value, body);
-}
-/* }}} */
-
-/* {{{ proto string imap_fetchbody(int stream_id, int msg_no, int section [, int options])
-   Get a specific body section */
-PHP_FUNCTION(imap_fetchbody)
-{
-	pval *streamind, *msgno, *sec,*flags;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	char *body;
-	unsigned long len;
-	int myargc=ARG_COUNT(ht);
-	if(myargc < 3 || myargc >4 || getParameters( ht, myargc, &streamind, &msgno, &sec,&flags ) == FAILURE ) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long( streamind );
-	convert_to_long( msgno );
-	convert_to_string( sec );
-	if(myargc == 4) convert_to_long(flags);
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find( ind, &ind_type );
-
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error( E_WARNING, "Unable to find stream pointer" );
-		RETURN_FALSE;
-	}
- 
-	body = mail_fetchbody_full( imap_le_struct->imap_stream, msgno->value.lval, sec->value.str.val, &len,myargc == 4 ? flags->value.lval : NIL );
-
-	if ( !body ) {
-		php_error( E_WARNING, "No body information available" );
-		RETURN_FALSE;
-	}
-	RETVAL_STRINGL( body ,len,1);
-}
-
-/* }}} */
-
-/* {{{ proto string imap_base64(string text)
-   Decode BASE64 encoded text */
-PHP_FUNCTION(imap_base64)
-{
-	pval *text;
-	char *decode;
-	unsigned long newlength;
-	if ( ARG_COUNT(ht) != 1 || getParameters( ht, 1, &text) == FAILURE ) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_string( text );
-	object_init(return_value);
-
-	decode = (char *) rfc822_base64((unsigned char *) text->value.str.val, text->value.str.len,&newlength);
-	RETVAL_STRINGL(decode,newlength,1);
-}
-/* }}} */
-
-/* {{{ proto string imap_qprint(string text)
-   Convert a quoted-printable string to an 8-bit string */
-PHP_FUNCTION(imap_qprint)
-{
-	pval *text;
-	char *decode;
-	unsigned long newlength;
-	if ( ARG_COUNT(ht) != 1 || getParameters( ht, 1, &text) == FAILURE ) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_string( text );
-	object_init(return_value);
-
-	decode = (char *) rfc822_qprint((unsigned char *) text->value.str.val, text->value.str.len,&newlength);
-	RETVAL_STRINGL(decode,newlength,1);
-}
-/* }}} */
-
-/* {{{ proto string imap_8bit(string text)
-   Convert an 8-bit string to a quoted-printable string */
-PHP_FUNCTION(imap_8bit)
-{
-	pval *text;
-	char *decode;
-	unsigned long newlength;
-	if ( ARG_COUNT(ht) != 1 || getParameters( ht, 1, &text) == FAILURE ) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_string( text );
-	object_init(return_value);
-
-	decode = (char *) rfc822_8bit((unsigned char *) text->value.str.val, text->value.str.len,&newlength);
-	RETVAL_STRINGL(decode,newlength,1);
-}
-/* }}} */
-
-/* {{{ proto string imap_binary(string text)
-   Convert an 8bit string to a base64 string */
-PHP_FUNCTION(imap_binary)
-{
-	pval *text;
-	unsigned long len;
-	if ( ARG_COUNT(ht) != 1 || getParameters( ht, 1, &text) == FAILURE ) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_string(text);
-	RETVAL_STRINGL(rfc822_binary(text->value.str.val,text->value.str.len,&len),len,1);
-}
-/* }}} */
-
-/* {{{ proto array imap_mailboxmsginfo(int stream_id)
-   Returns info about the current mailbox in an associative array */
-PHP_FUNCTION(imap_mailboxmsginfo)
-{
-	pval *streamind;
-	char date[100];
-	int ind, ind_type;
-	unsigned int msgno;
-	pils *imap_le_struct;
-	unsigned unreadmsg,msize;
-
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &streamind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(streamind);
-
-	ind = streamind->value.lval;
-
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-
-	/* Initialize return array */
-	if(object_init(return_value) == FAILURE) {
-		RETURN_FALSE;
-	}
-
-	unreadmsg = 0;
-	msize = 0;
-	for (msgno = 1; msgno <= imap_le_struct->imap_stream->nmsgs; msgno++) {
-		MESSAGECACHE * cache = mail_elt (imap_le_struct->imap_stream,msgno);
-		mail_fetchstructure (imap_le_struct->imap_stream,msgno,NIL);
-		unreadmsg = cache->recent ? (cache->seen ? unreadmsg : unreadmsg++) : unreadmsg;
-		unreadmsg = (cache->recent | cache->seen) ? unreadmsg : unreadmsg++;
-		msize = msize + cache->rfc822_size;
-	}
-	add_property_long(return_value,"Unread",unreadmsg);
-	add_property_long(return_value,"Nmsgs",imap_le_struct->imap_stream->nmsgs);
-	add_property_long(return_value,"Size",msize);
-	rfc822_date(date);
-	add_property_string(return_value,"Date",date,1);
-	add_property_string(return_value,"Driver",imap_le_struct->imap_stream->dtb->name,1);
-	add_property_string(return_value,"Mailbox",imap_le_struct->imap_stream->mailbox,1);
-	add_property_long(return_value,"Recent",imap_le_struct->imap_stream->recent);
-}
-/* }}} */
-
-/* {{{ proto string imap_rfc822_write_address(string mailbox, string host, string personal)
-   Returns a properly formatted email address given the mailbox, host, and personal info */
-PHP_FUNCTION(imap_rfc822_write_address)
-{
-	pval *mailbox,*host,*personal;
-	ADDRESS *addr;
-	char string[MAILTMPLEN];
-	int argc;
-	argc=ARG_COUNT(ht);
-	if ( argc != 3 || getParameters( ht, argc, &mailbox,&host,&personal) == FAILURE ) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_string(mailbox);
-	convert_to_string(host);
-	convert_to_string(personal);
-	addr=mail_newaddr();
-	if(mailbox) addr->mailbox = cpystr(mailbox->value.str.val);
-	if(host) addr->host = cpystr(host->value.str.val);
-	if(personal) addr->personal = cpystr(personal->value.str.val);
-	addr->next=NIL;
-	addr->error=NIL;
-	addr->adl=NIL;
-	string[0]=0x00;
-  
-	rfc822_write_address(string,addr);
-	RETVAL_STRING(string,1);
-}
-/* }}} */
-
-/* {{{ proto array imap_rfc822_parse_adrlist(string address_string, string default_host)
-   Parses an address string */
-PHP_FUNCTION(imap_rfc822_parse_adrlist)
-{
-	pval *str,*defaulthost,*tovals;
-	ADDRESS *addresstmp;
-	ENVELOPE *env;
-	int argc;
-
-	env=mail_newenvelope();
-	argc=ARG_COUNT(ht);
-	if ( argc != 2 || getParameters( ht, argc, &str,&defaulthost) == FAILURE ) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_string(str);
-	convert_to_string(defaulthost);
-	rfc822_parse_adrlist(&env->to,str->value.str.val,defaulthost->value.str.val);
-	if(array_init(return_value) == FAILURE) {
-		RETURN_FALSE;
-	}
-	addresstmp=env->to;
-	if(addresstmp) do {
-		MAKE_STD_ZVAL(tovals);
-		object_init(tovals);
-		if(addresstmp->mailbox) add_property_string(tovals,"mailbox",addresstmp->mailbox,1);
-		if(addresstmp->host) add_property_string(tovals,"host",addresstmp->host,1);
-		if(addresstmp->personal) add_property_string(tovals,"personal",addresstmp->personal,1);
-		if(addresstmp->adl) add_property_string(tovals,"adl",addresstmp->adl,1);
-		add_next_index_object(return_value, tovals);
-	} while ((addresstmp = addresstmp->next));
-}
-/* }}} */
-
-
-
-/* {{{ proto string imap_utf8(string string)
-   Convert a string to UTF-8 */
-PHP_FUNCTION(imap_utf8)
-{
-	pval *str;
-	int argc;
-	SIZEDTEXT src, dest;
-	
-	src.data  = NULL;
-	src.size  = 0;
-	dest.data = NULL;
-	dest.size = 0;
-	
-	argc = ARG_COUNT(ht);
-	if (argc != 1 || getParameters(ht, argc, &str) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_string(str);
-	cpytxt(&src, str->value.str.val, str->value.str.len);
-	utf8_mime2text(&src, &dest);
-	RETURN_STRINGL(dest.data, strlen(dest.data), 1);
-}
-/* }}} */
-
-/* macros for the modified utf7 conversion functions */
-/* author: Andrew Skalski <askalski@chek.com> */
-
-/* tests `c' and returns true if it is a special character */
-#define SPECIAL(c) ((c) <= 0x1f || (c) >= 0x7f)
-/* validate a modified-base64 character */
-#define B64CHAR(c) (isalnum(c) || (c) == '+' || (c) == ',')
-/* map the low 64 bits of `n' to the modified-base64 characters */
-#define B64(n)  ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-                "abcdefghijklmnopqrstuvwxyz0123456789+,"[(n) & 0x3f])
-/* map the modified-base64 character `c' to its 64 bit value */
-#define UNB64(c)        ((c) == '+' ? 62 : (c) == ',' ? 63 : (c) >= 'a' ? \
-                        (c) - 71 : (c) >= 'A' ? (c) - 65 : (c) + 4)
-
-/* {{{ proto string imap_utf7_decode(string buf)
-   Decode a modified UTF-7 string */
-PHP_FUNCTION(imap_utf7_decode)
-{
-	/* author: Andrew Skalski <askalski@chek.com> */
-	int	argc;
-	pval *arg;
-	const unsigned char *in, *inp, *endp;
-	unsigned char *out, *outp;
-	int	inlen, outlen;
-	enum {
-		ST_NORMAL,	/* printable text */
-		ST_DECODE0,	/* encoded text rotation... */
-		ST_DECODE1,
-		ST_DECODE2,
-		ST_DECODE3
-	} state;
-	
-	/* collect arguments */
-	argc = ARG_COUNT(ht);
-	if (argc != 1 || getParameters(ht, argc, &arg) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_string(arg);
-	in = (const unsigned char*) arg->value.str.val;
-	inlen = arg->value.str.len;
-	
-	/* validate and compute length of output string */
-	outlen = 0;
-	state = ST_NORMAL;
-	for (endp = (inp = in) + inlen; inp < endp; inp++) {
-		if (state == ST_NORMAL) {
-			/* process printable character */
-			if (SPECIAL(*inp)) {
-				php_error(E_WARNING, "imap_utf7_decode: "
-					"Invalid modified UTF-7 character: "
-					"`%c'", *inp);
-				RETURN_FALSE;
-			}
-			else if (*inp != '&') {
-				outlen++;
-			}
-			else if (inp + 1 == endp) {
-				php_error(E_WARNING, "imap_utf7_decode: "
-					"Unexpected end of string");
-				RETURN_FALSE;
-			}
-			else if (inp[1] != '-') {
-				state = ST_DECODE0;
-			}
-			else {
-				outlen++;
-				inp++;
-			}
-		}
-		else if (*inp == '-') {
-			/* return to NORMAL mode */
-			if (state == ST_DECODE1) {
-				php_error(E_WARNING, "imap_utf7_decode: "
-					"Stray modified base64 character: "
-					"`%c'", *--inp);
-				RETURN_FALSE;
-			}
-			state = ST_NORMAL;
-		}
-		else if (!B64CHAR(*inp)) {
-			php_error(E_WARNING, "imap_utf7_decode: "
-				"Invalid modified base64 character: "
-				"`%c'", *inp);
-			RETURN_FALSE;
-		}
-		else {
-			switch (state) {
-			case ST_DECODE3:
-				outlen++;
-				state = ST_DECODE0;
-				break;
-			case ST_DECODE2:
-			case ST_DECODE1:
-				outlen++;
-			case ST_DECODE0:
-				state++;
-			case ST_NORMAL:
-				break;
-			}
-		}
-	}
-
-	/* enforce end state */
-	if (state != ST_NORMAL) {
-		php_error(E_WARNING, "imap_utf7_decode: "
-			"Unexpected end of string");
-		RETURN_FALSE;
-	}
-
-	/* allocate output buffer */
-	if ((out = emalloc(outlen + 1)) == NULL) {
-		php_error(E_WARNING, "imap_utf7_decode: "
-			"Unable to allocate result string");
-		RETURN_FALSE;
-	}
-
-	/* decode input string */
-	outp = out;
-	state = ST_NORMAL;
-	for (endp = (inp = in) + inlen; inp < endp; inp++) {
-		if (state == ST_NORMAL) {
-			if (*inp == '&' && inp[1] != '-') {
-				state = ST_DECODE0;
-			}
-			else if ((*outp++ = *inp) == '&') {
-				inp++;
-			}
-		}
-		else if (*inp == '-') {
-			state = ST_NORMAL;
-		}
-		else {
-			/* decode input character */
-			switch (state) {
-			case ST_DECODE0:
-				*outp = UNB64(*inp) << 2;
-				state = ST_DECODE1;
-				break;
-			case ST_DECODE1:
-				outp[1] = UNB64(*inp);
-				*outp++ |= outp[1] >> 4;
-				*outp <<= 4;
-				state = ST_DECODE2;
-				break;
-			case ST_DECODE2:
-				outp[1] = UNB64(*inp);
-				*outp++ |= outp[1] >> 2;
-				*outp <<= 6;
-				state = ST_DECODE3;
-				break;
-			case ST_DECODE3:
-				*outp++ |= UNB64(*inp);
-				state = ST_DECODE0;
-			case ST_NORMAL:
-				break;
-			}
-		}
-	}
-
-	*outp = 0;
-
-#if PHP_DEBUG
-	/* warn if we computed outlen incorrectly */
-	if (outp - out != outlen) {
-		php_error(E_WARNING,
-			"imap_utf7_decode: outp - out [%d] != outlen [%d]",
-			outp - out, outlen);
-	}
-#endif
-
-	RETURN_STRINGL(out, outlen, 0);
-}
-/* }}} */
-
-/* {{{ proto string imap_utf7_encode(string buf)
-   Encode a string in modified UTF-7 */
-PHP_FUNCTION(imap_utf7_encode)
-{
-	/* author: Andrew Skalski <askalski@chek.com> */
-	int			argc;
-	pval			*arg;
-	const unsigned char	*in, *inp, *endp;
-	unsigned char		*out, *outp;
-	int			inlen, outlen, slen;
-	enum {	ST_NORMAL,	/* printable text */
-		ST_ENCODE0,	/* encoded text rotation... */
-		ST_ENCODE1,
-		ST_ENCODE2
-	}			state;
-
-	/* collect arguments */
-	argc = ARG_COUNT(ht);
-	if (argc != 1 || getParameters(ht, argc, &arg) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_string(arg);
-	in = (const unsigned char*) arg->value.str.val;
-	inlen = arg->value.str.len;
-
-	/* compute the length of the result string */
-	outlen = 0;
-	state = ST_NORMAL;
-	endp = (inp = in) + inlen;
-	while (inp < endp) {
-		if (state == ST_NORMAL) {
-			if (SPECIAL(*inp)) {
-				state = ST_ENCODE1;
-				slen=1;
-			}
-			else if (*inp == '&') {
-				outlen++;
-			}
-			outlen++;
-		}
-		else if (!SPECIAL(*inp)) {
-			state = ST_NORMAL;
-			outlen+=2+slen*3-slen/3;
-			slen=0;
-		}
-		else {
-		        slen++;
-		}
-		inp++;
-	}
-	if(state!=ST_NORMAL)
-	  outlen+=1+slen*3-slen/3;
-
-	/* allocate output buffer */
-	if ((out = emalloc(outlen + 1)) == NULL) {
-		php_error(E_WARNING, "imap_utf7_encode: "
-			"Unable to allocate result string");
-		RETURN_FALSE;
-	}
-
-	/* encode input string */
-	outp = out;
-	state = ST_NORMAL;
-	endp = (inp = in) + inlen;
-	while (inp < endp || state != ST_NORMAL) {
-		if (state == ST_NORMAL) {
-			if (SPECIAL(*inp)) {
-				/* begin encoding */
-				*outp++ = '&';
-				state = ST_ENCODE0;
-			}
-			else if ((*outp++ = *inp++) == '&') {
-				*outp++ = '-';
-			}
-		}
-		else if (inp == endp || !SPECIAL(*inp)) {
-			/* flush overflow and terminate region */
-			if (state != ST_ENCODE0) {
-				*outp++ = B64(*outp);
-			}
-			*outp++ = '-';
-			state = ST_NORMAL;
-		}
-		else {
-			/* encode input character */
-			switch (state) {
-			case ST_ENCODE0:
-				*outp++ = B64((*inp>>8) >> 2);
-				*outp = (*inp>>8) << 4;
-				state = ST_ENCODE1;
-				break;
-			case ST_ENCODE1:
-				*outp++ = B64(*outp | (*inp>>8) >> 4);
-				*outp = (*inp>>8) << 2;
-				state = ST_ENCODE2;
-				break;
-			case ST_ENCODE2:
-				*outp++ = B64(*outp | (*inp>>8) >> 6);
-				*outp++ = B64((*inp>>8));
-				state = ST_ENCODE0;
-			case ST_NORMAL:
-				break;
-			}
-			switch (state) {
-			case ST_ENCODE0:
-				*outp++ = B64((*inp&0xff) >> 2);
-				*outp = (*inp&0xff) << 4;
-				state = ST_ENCODE1;
-				break;
-			case ST_ENCODE1:
-				*outp++ = B64(*outp | (*inp&0xff) >> 4);
-				*outp = (*inp&0xff) << 2;
-				state = ST_ENCODE2;
-				break;
-			case ST_ENCODE2:
-				*outp++ = B64(*outp | (*inp&0xff) >> 6);
-				*outp++ = B64((*inp&0xff));
-				state = ST_ENCODE0;
-			case ST_NORMAL:
-				break;
-			}
-			inp++;
-		}
-	}
-
-	*outp = 0;
-
-#if PHP_DEBUG
-	/* warn if we computed outlen incorrectly */
-	if (outp - out != outlen) {
-		php_error(E_WARNING,
-			"imap_utf7_encode: outp - out [%d] != outlen [%d]",
-			outp - out, outlen);
-	}
-#endif
-
-	RETURN_STRINGL(out, outlen, 0);
-}
-/* }}} */
-
-#undef SPECIAL
-#undef B64CHAR
-#undef B64
-#undef UNB64
-
-
-
-/* {{{ proto int imap_setflag_full(int stream_id, string sequence, string flag [, int options])
-   Sets flags on messages */
-PHP_FUNCTION(imap_setflag_full)
-{
-	pval *streamind;
-	pval *sequence;
-	pval *flag;
-	pval *flags;
-	int ind,ind_type;
-	pils *imap_le_struct;
-	int myargc=ARG_COUNT(ht);
-
-	if (myargc < 3 || myargc > 4 || getParameters(ht, myargc, &streamind,&sequence,&flag,&flags) ==FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(streamind);
-	convert_to_string(sequence);
-	convert_to_string(flag);
-	if(myargc==4) convert_to_long(flags);
-
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	mail_setflag_full(imap_le_struct->imap_stream,sequence->value.str.val,flag->value.str.val,myargc == 4 ? flags->value.lval : NIL);
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int imap_clearflag_full(int stream_id, string sequence, string flag [, int options])
-   Clears flags on messages */
-PHP_FUNCTION(imap_clearflag_full)
-{
-	pval *streamind;
-	pval *sequence;
-	pval *flag;
-	pval *flags;
-	int ind,ind_type;
-	pils *imap_le_struct;
-	int myargc=ARG_COUNT(ht);
-	if (myargc < 3 || myargc > 4 || getParameters(ht, myargc, &streamind,&sequence,&flag,&flags) ==FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(streamind);
-	convert_to_string(sequence);
-	convert_to_string(flag);
-	if(myargc==4) convert_to_long(flags);
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if(!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	mail_clearflag_full(imap_le_struct->imap_stream,sequence->value.str.val,flag->value.str.val,myargc == 4 ? flags->value.lval : NIL);
-        RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto array imap_sort(int stream_id, int criteria, int reverse [, int options])
-   Sort an array of message headers */
-PHP_FUNCTION(imap_sort)
-{
-	pval *streamind;
-	pval *pgm;
-	pval *rev;
-	pval *flags;
-	int ind,ind_type;
-	unsigned long *slst,*sl;
-	SORTPGM *mypgm=NIL;
-	SEARCHPGM *spg=NIL;
-	pils *imap_le_struct;
-	int myargc=ARG_COUNT(ht);
-	if (myargc < 3 || myargc > 4 || getParameters(ht, myargc, &streamind,&pgm,&rev,&flags) ==FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(streamind);
-	convert_to_long(rev);
-	convert_to_long(pgm);
-	if (pgm->value.lval>SORTSIZE) {
-		php_error(E_WARNING, "Unrecognized sort criteria");
-		RETURN_FALSE;
-	}
-	if (myargc==4) convert_to_long(flags);
-	
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	spg = mail_newsearchpgm();
-	mypgm=mail_newsortpgm();
-	mypgm->reverse=rev->value.lval;
-	mypgm->function=pgm->value.lval;
-	mypgm->next=NIL;
-	
-	array_init(return_value);
-	slst = mail_sort(imap_le_struct->imap_stream,NIL,spg,mypgm,myargc == 4 ? flags->value.lval:NIL);
-	
-	for (sl = slst; *sl; sl++) { 
-		add_next_index_long(return_value,*sl);
-	}
-	fs_give ((void **) &slst); 
-}
-/* }}} */
-
-/* {{{ proto string imap_fetchheader(int stream_id, int msg_no [, int options])
-   Get the full unfiltered header for a message */
-PHP_FUNCTION(imap_fetchheader)
-{
-	pval *streamind, *msgno, *flags;
-	int ind, ind_type, msgindex;
-	pils *imap_le_struct;
-	int myargc = ARG_COUNT(ht);
-	if (myargc < 2 || myargc > 3 || getParameters(ht,myargc,&streamind,&msgno,&flags) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_long(streamind);
-	convert_to_long(msgno);
-	if (myargc == 3) convert_to_long(flags);
-	ind = streamind->value.lval;
-	
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	
-	if ((myargc == 3) && (flags->value.lval & FT_UID)) {
-		/* This should be cached; if it causes an extra RTT to the
-           IMAP server, then that's the price we pay for making sure
-           we don't crash. */
-		msgindex = mail_msgno(imap_le_struct->imap_stream, msgno->value.lval);
-	} else {
-		msgindex = msgno->value.lval;
-	}
-	if ((msgindex < 1) || (msgindex > imap_le_struct->imap_stream->nmsgs)) {
-		php_error(E_WARNING, "Bad message number");
-		RETURN_FALSE;
-	}
-	
-	RETVAL_STRING(mail_fetchheader_full(imap_le_struct->imap_stream, msgno->value.lval, NIL, NIL, myargc == 3 ? flags->value.lval : NIL), 1);
-}
-/* }}} */
-
-/* {{{ proto int imap_uid(int stream_id, int msg_no)
-   Get the unique message id associated with a standard sequential message number */
-PHP_FUNCTION(imap_uid)
-{
- 	pval *streamind, *msgno;
- 	int ind, ind_type;
-	pils *imap_le_struct;
- 
- 	if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&streamind,&msgno) == FAILURE) {
- 		WRONG_PARAM_COUNT;
- 	}
- 	
- 	convert_to_long(streamind);
- 	convert_to_long(msgno);
- 
- 	ind = streamind->value.lval;
- 
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
- 
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-	php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
- 
-	RETURN_LONG(mail_uid(imap_le_struct->imap_stream, msgno->value.lval));
-}
-/* }}} */
- 
-/* {{{ proto int imap_msgno(int stream_id, int unique_msg_id)
-   Get the sequence number associated with a UID */
-PHP_FUNCTION(imap_msgno)
-{
- 	pval *streamind, *msgno;
- 	int ind, ind_type;
-	pils *imap_le_struct;
- 
- 	if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&streamind,&msgno) == FAILURE) {
- 		WRONG_PARAM_COUNT;
- 	}
- 	
- 	convert_to_long(streamind);
- 	convert_to_long(msgno);
- 
- 	ind = streamind->value.lval;
- 
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
- 
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
- 
- 	RETURN_LONG(mail_msgno(imap_le_struct->imap_stream, msgno->value.lval));
-}
-/* }}} */
-
-/* {{{ proto object imap_status(int stream_id, string mailbox, int options)
-   Get status info from a mailbox */
-PHP_FUNCTION(imap_status)
-{
- 	pval *streamind, *mbx, *flags;
- 	int ind, ind_type;
-	pils *imap_le_struct;
-	int myargc=ARG_COUNT(ht);
- 	if (myargc != 3 || getParameters(ht,myargc,&streamind,&mbx,&flags) == FAILURE) {
- 		WRONG_PARAM_COUNT;
- 	}
- 	
- 	convert_to_long(streamind);
- 	convert_to_string(mbx);
-	convert_to_long(flags);
- 	ind = streamind->value.lval;
- 
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
- 
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
- 
-	if(object_init(return_value) == FAILURE){
-	  RETURN_FALSE;
-	}
- 	if(mail_status(imap_le_struct->imap_stream, mbx->value.str.val, flags->value.lval))
-	  {
-	    add_property_long(return_value,"flags",status_flags);
-	    if(status_flags & SA_MESSAGES) add_property_long(return_value,"messages",status_messages);
-	    if(status_flags & SA_RECENT) add_property_long(return_value,"recent",status_recent);
-	    if(status_flags & SA_UNSEEN) add_property_long(return_value,"unseen",status_unseen);
-	    if(status_flags & SA_UIDNEXT) add_property_long(return_value,"uidnext",status_uidnext);
-	    if(status_flags & SA_UIDVALIDITY) add_property_long(return_value,"uidvalidity",status_uidvalidity);
-#ifdef SA_QUOTA
-	    if(status_flags & SA_QUOTA) add_property_long(return_value,"quota",status_quota);
-#endif
-#ifdef SA_QUOTA
-	    if(status_flags & SA_QUOTA_ALL) add_property_long(return_value,"quota_all",status_quota_all);
-#endif
-	  }
-	else
-	  {
-	  RETURN_FALSE;
-	  }
-}
-/* }}} */
- 
-/* {{{ proto object imap_bodystruct(int stream_id, int msg_no, int section)
-   Read the structure of a specified body section of a specific message */
-PHP_FUNCTION(imap_bodystruct)
-{
-	pval *streamind, *msg, *section;
-	int ind, ind_type;
-	pils *imap_le_struct;
-	pval *parametres, *param, *dparametres, *dparam;
-	PARAMETER *par, *dpar;
-	BODY *body;
-	int myargc=ARG_COUNT(ht);
-
-	if (myargc != 3 || getParameters(ht,myargc,&streamind,&msg,&section) == FAILURE) {
- 		WRONG_PARAM_COUNT;
- 	}
- 	
- 	convert_to_long(streamind);
- 	convert_to_long(msg);
-	convert_to_string(section);
- 	ind = streamind->value.lval;
- 
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	
-	if (object_init(return_value) == FAILURE) {
-		RETURN_FALSE;
-	}
-	
-	body=mail_body(imap_le_struct->imap_stream, msg->value.lval, section->value.str.val);
-	if(body->type) add_property_long( return_value, "type", body->type );
-	if(body->encoding) add_property_long( return_value, "encoding", body->encoding );
-	
-	if (body->subtype){
-		add_property_long( return_value, "ifsubtype", 1 );
-		add_property_string( return_value, "subtype",  body->subtype, 1 );
-	} else {
-		add_property_long( return_value, "ifsubtype", 0 );
-	}
-	
-	if (body->description){
-		add_property_long( return_value, "ifdescription", 1 );
-		add_property_string( return_value, "description",  body->description, 1 );
-	} else {
-		add_property_long( return_value, "ifdescription", 0 );
-	}
-	if (body->id){
-		add_property_long( return_value, "ifid", 1 );
-		add_property_string( return_value, "id",  body->id, 1 );
-	} else {
-		add_property_long( return_value, "ifid", 0 );
-	}
-
-	
-	if(body->size.lines) add_property_long( return_value, "lines", body->size.lines );
-	if(body->size.bytes) add_property_long( return_value, "bytes", body->size.bytes );
-#ifdef IMAP41
-	if ( body->disposition.type ){
-		add_property_long( return_value, "ifdisposition", 1);
-		add_property_string( return_value, "disposition", body->disposition.type, 1);
-	} else {
-		add_property_long( return_value, "ifdisposition", 0);
-	}
-	
-	if (body->disposition.parameter) {
-		dpar = body->disposition.parameter;
-		add_property_long( return_value, "ifdparameters", 1);
-		MAKE_STD_ZVAL(dparametres);
-		array_init(dparametres);
-		do {
-			MAKE_STD_ZVAL(dparam);
-			object_init(dparam);
-			add_property_string(dparam, "attribute", dpar->attribute, 1);
-			add_property_string(dparam, "value", dpar->value, 1);
-			add_next_index_object(dparametres, dparam );
-		} while ((dpar = dpar->next));
-		add_assoc_object(return_value, "dparameters", dparametres);
-	} else {
-		add_property_long(return_value, "ifdparameters", 0);
-	}
-#endif
-	
-	if ((par = body->parameter)) {
-		add_property_long(return_value, "ifparameters", 1);
-		
-		MAKE_STD_ZVAL(parametres);
-		array_init(parametres);
-		do {
-			MAKE_STD_ZVAL(param);
-			object_init(param);
-			if(par->attribute) add_property_string(param, "attribute", par->attribute, 1 );
-			if(par->value) add_property_string(param, "value", par->value, 1 );
-			
-			add_next_index_object(parametres, param);
-		} while ((par = par->next));
-	} else {
-		MAKE_STD_ZVAL(parametres);
-		object_init(parametres);
-		add_property_long(return_value, "ifparameters", 0);
-	}
-	add_assoc_object(return_value, "parameters", parametres);
-}
-
-/* }}} */
-
-/* {{{ proto array imap_fetch_overview(int stream_id, int msg_no)
-   Read an overview of the information in the headers of the given message */ 
-PHP_FUNCTION(imap_fetch_overview)
-{
- 	pval *streamind, *sequence, *pflags;
- 	int ind, ind_type;
-	pils *imap_le_struct;
-	pval *myoverview;
-	char address[MAILTMPLEN];
-	int myargc=ARG_COUNT(ht);
-	long status,flags=0L;
-
- 	if (myargc <2 || myargc >3 || getParameters(ht,myargc,&streamind,&sequence,&flags) == FAILURE) {
- 		WRONG_PARAM_COUNT;
- 	}
- 	
- 	convert_to_long(streamind);
- 	convert_to_string(sequence);
-        if(myargc==3) {
-                convert_to_long(pflags);
-                flags = pflags->value.lval;
-        }                                                                                                                
- 	ind = streamind->value.lval;
- 	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	array_init(return_value);
- 
-        status = (flags & FT_UID)
-                ? mail_uid_sequence (imap_le_struct->imap_stream,sequence->value.str.val)
-                : mail_sequence (imap_le_struct->imap_stream,sequence->value.str.val)
-                ;
- 
- 
-        if (status) {  
-		MESSAGECACHE *elt;
-		ENVELOPE *env;
-		unsigned long i;
-
-		for (i = 1; i <= imap_le_struct->imap_stream->nmsgs; i++) {
-			if (((elt = mail_elt (imap_le_struct->imap_stream,i))->sequence) &&
-				(env = mail_fetch_structure (imap_le_struct->imap_stream,i,NIL,NIL))) {
-				MAKE_STD_ZVAL(myoverview);
-				object_init(myoverview);
-				if(env->subject)
-				        add_property_string(myoverview,"subject",env->subject,1);
-				if(env->from) {
-				        env->from->next=NULL;
-				        rfc822_write_address(address,env->from);
-				        add_property_string(myoverview,"from",address,1);
-				}
-				if(env->date)
-				        add_property_string(myoverview,"date",env->date,1);
-				if(env->message_id)
-				        add_property_string(myoverview,"message_id",env->message_id,1);
-				if(env->references)
-				        add_property_string(myoverview,"references",env->references,1);
-				add_property_long(myoverview,"size",elt->rfc822_size);
-				add_property_long(myoverview,"uid",mail_uid(imap_le_struct->imap_stream,i));
-				add_property_long(myoverview,"msgno",i);
-				add_property_long(myoverview,"recent",elt->recent);
-				add_property_long(myoverview,"flagged",elt->flagged);
-				add_property_long(myoverview,"answered",elt->answered);
-				add_property_long(myoverview,"deleted",elt->deleted);
-				add_property_long(myoverview,"seen",elt->seen);
-				add_property_long(myoverview,"draft",elt->draft);
-				add_next_index_object(return_value,myoverview);
-			}
-		}
-	}
-}
-
-/* }}} */
-
-/* {{{ proto string imap_mail_compose(array envelope, array body)
-   Create a MIME message based on given envelope and body sections */
-PHP_FUNCTION(imap_mail_compose)
-{
-	pval *envelope, *body;
-	char *key;
-	pval *data, **pvalue;
-	ulong ind;
-	char *cookie = NIL;
-	ENVELOPE *env;
-	BODY *bod=NULL, *topbod=NULL;
-	PART *mypart=NULL, *toppart=NULL, *part;
-	PARAMETER *param;
-	char tmp[8*MAILTMPLEN], *mystring=NULL, *t, *tempstring;
-	
-	int myargc = ARG_COUNT(ht);
-	if (myargc != 2 || getParameters(ht,myargc,&envelope,&body) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_array(envelope);
-	convert_to_array(body);
-	env=mail_newenvelope();
-	if(zend_hash_find(envelope->value.ht,"remail",sizeof("remail"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		env->remail=cpystr((*pvalue)->value.str.val);
-	}
-
-	if(zend_hash_find(envelope->value.ht,"return_path",sizeof("return_path"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		rfc822_parse_adrlist (&env->return_path,(*pvalue)->value.str.val,"NO HOST");
-	}
-	if(zend_hash_find(envelope->value.ht,"date",sizeof("date"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		env->date=cpystr((*pvalue)->value.str.val);
-	}
-	if(zend_hash_find(envelope->value.ht,"from",sizeof("from"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		rfc822_parse_adrlist (&env->from,(*pvalue)->value.str.val,"NO HOST");
-	}
-	if(zend_hash_find(envelope->value.ht,"reply_to",sizeof("reply_to"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		rfc822_parse_adrlist (&env->reply_to,(*pvalue)->value.str.val,"NO HOST");
-	}
-	if(zend_hash_find(envelope->value.ht,"to",sizeof("to"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		rfc822_parse_adrlist (&env->to,(*pvalue)->value.str.val,"NO HOST");
-	}
-	if(zend_hash_find(envelope->value.ht,"cc",sizeof("cc"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		rfc822_parse_adrlist (&env->cc,(*pvalue)->value.str.val,"NO HOST");
-	}
-	if(zend_hash_find(envelope->value.ht,"bcc",sizeof("bcc"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		rfc822_parse_adrlist (&env->bcc,(*pvalue)->value.str.val,"NO HOST");
-	}
-	if(zend_hash_find(envelope->value.ht,"message_id",sizeof("message_id"),(void **) &pvalue)== SUCCESS){
-		SEPARATE_ZVAL(pvalue);
-		convert_to_string(*pvalue);
-		env->message_id=cpystr((*pvalue)->value.str.val);
-	}
- 
-	zend_hash_internal_pointer_reset(body->value.ht);
-	zend_hash_get_current_key(body->value.ht, &key, &ind);
-	zend_hash_get_current_data(body->value.ht, (void **) &data);
-	if(data->type == IS_ARRAY) {
-		bod=mail_newbody();
-		topbod=bod;
-		if(zend_hash_find(data->value.ht,"type",sizeof("type"),(void **) &pvalue)== SUCCESS) {
-			SEPARATE_ZVAL(pvalue);
-			convert_to_long(*pvalue);
-			bod->type = (*pvalue)->value.lval;
-		}
-		if(zend_hash_find(data->value.ht,"encoding",sizeof("encoding"),(void **) &pvalue)== SUCCESS){
-			SEPARATE_ZVAL(pvalue);
-			convert_to_long(*pvalue);
-			bod->encoding = (*pvalue)->value.lval;
-		}
-		if(zend_hash_find(data->value.ht,"subtype",sizeof("subtype"),(void **) &pvalue)== SUCCESS){
-			SEPARATE_ZVAL(pvalue);
-			convert_to_string(*pvalue);
-			bod->subtype = cpystr((*pvalue)->value.str.val);
-		}
-		if(zend_hash_find(data->value.ht,"id",sizeof("id"),(void **) &pvalue)== SUCCESS){
-			SEPARATE_ZVAL(pvalue);
-			convert_to_string(*pvalue);
-			bod->id = cpystr((*pvalue)->value.str.val);
-		}
-		if(zend_hash_find(data->value.ht,"contents.data",sizeof("contents.data"),(void **) &pvalue)== SUCCESS){
-			SEPARATE_ZVAL(pvalue);
-			convert_to_string(*pvalue);     
-			bod->contents.text.data=(char *)fs_get((*pvalue)->value.str.len);
-			memcpy(bod->contents.text.data,(*pvalue)->value.str.val,(*pvalue)->value.str.len+1);
-			bod->contents.text.size = (*pvalue)->value.str.len;
-		}
-		if(zend_hash_find(data->value.ht,"lines",sizeof("lines"),(void **) &pvalue)== SUCCESS){
-			SEPARATE_ZVAL(pvalue);
-			convert_to_long(*pvalue);
-			bod->size.lines = (*pvalue)->value.lval;
-		}
-		if(zend_hash_find(data->value.ht,"bytes",sizeof("bytes"),(void **) &pvalue)== SUCCESS){
-			SEPARATE_ZVAL(pvalue);
-			convert_to_long(*pvalue);
-			bod->size.bytes = (*pvalue)->value.lval;
-		}
-		if(zend_hash_find(data->value.ht,"md5",sizeof("md5"),(void **) &pvalue)== SUCCESS){
-			SEPARATE_ZVAL(pvalue);
-			convert_to_string(*pvalue);
-			bod->md5 = cpystr((*pvalue)->value.str.val);
-		}
-	}
-	zend_hash_move_forward(body->value.ht);
-	while(zend_hash_get_current_data(body->value.ht, (void **) &data)==SUCCESS) {
-		zend_hash_get_current_key(body->value.ht, &key, &ind);
-		if(data->type == IS_ARRAY) {
-			if(!toppart) {
-				bod->nested.part=mail_newbody_part();
-				mypart=bod->nested.part;
-				toppart=mypart;
-				bod=&mypart->body;
-			} else {
-				 mypart->next=mail_newbody_part();
-				 mypart=mypart->next;
-				 bod=&mypart->body;
-			}
-			if(zend_hash_find(data->value.ht,"type",sizeof("type"),(void **) &pvalue)== SUCCESS) {
-				SEPARATE_ZVAL(pvalue);
-				convert_to_long(*pvalue);
-				bod->type = (*pvalue)->value.lval;
-			}
-			if(zend_hash_find(data->value.ht,"encoding",sizeof("encoding"),(void **) &pvalue)== SUCCESS){
-				SEPARATE_ZVAL(pvalue);
-				convert_to_long(*pvalue);
-				bod->encoding = (*pvalue)->value.lval;
-			}
-			if(zend_hash_find(data->value.ht,"subtype",sizeof("subtype"),(void **) &pvalue)== SUCCESS){
-				SEPARATE_ZVAL(pvalue);
-				convert_to_string(*pvalue);
-				bod->subtype=cpystr((*pvalue)->value.str.val);
-			}
-			if(zend_hash_find(data->value.ht,"id",sizeof("id"),(void **) &pvalue)== SUCCESS){
-				SEPARATE_ZVAL(pvalue);
-				convert_to_string(*pvalue);
-				bod->id=cpystr((*pvalue)->value.str.val);
-			}
-			if(zend_hash_find(data->value.ht,"contents.data",sizeof("contents.data"),(void **) &pvalue)== SUCCESS){
-				SEPARATE_ZVAL(pvalue);
-				convert_to_string(*pvalue);     
-				bod->contents.text.data=(char *)fs_get((*pvalue)->value.str.len);
-				memcpy(bod->contents.text.data,(*pvalue)->value.str.val,(*pvalue)->value.str.len+1);
-				bod->contents.text.size=(*pvalue)->value.str.len;
-			}
-			if(zend_hash_find(data->value.ht,"lines",sizeof("lines"),(void **) &pvalue)== SUCCESS){
-				SEPARATE_ZVAL(pvalue);
-				convert_to_long(*pvalue);
-				bod->size.lines=(*pvalue)->value.lval;
-			}
-			if(zend_hash_find(data->value.ht,"bytes",sizeof("bytes"),(void **) &pvalue)== SUCCESS){
-				SEPARATE_ZVAL(pvalue);
-				convert_to_long(*pvalue);
-				bod->size.bytes=(*pvalue)->value.lval;
-			}
-			if(zend_hash_find(data->value.ht,"md5",sizeof("md5"),(void **) &pvalue)== SUCCESS){
-				SEPARATE_ZVAL(pvalue);
-				convert_to_string(*pvalue);
-				bod->md5=cpystr((*pvalue)->value.str.val);
-			}
-			zend_hash_move_forward(body->value.ht);
-		}
-	}
-
-	rfc822_encode_body_7bit (env,topbod); 
-	rfc822_header (tmp,env,topbod);  
-	mystring=emalloc(strlen(tmp)+1);
-	strcpy(mystring,tmp);
-
-	bod=topbod;
-	switch (bod->type) {
-		case TYPEMULTIPART:           /* multipart gets special handling */
-			part = bod->nested.part;   /* first body part */
-										/* find cookie */
-			for (param = bod->parameter; param && !cookie; param = param->next) {
-				if (!strcmp (param->attribute,"BOUNDARY")) {
-					cookie = param->value;
-				}
-			}
-			if (!cookie) {
-				cookie = "-";  /* yucky default */
-			}
-			do {                        /* for each part */
-                    /* build cookie */
-				sprintf (t=tmp,"--%s\015\012",cookie);
-										/* append mini-header */
-				rfc822_write_body_header (&t,&part->body);
-				strcat (t,"\015\012");    /* write terminating blank line */
-										/* output cookie, mini-header, and contents */
-				tempstring=emalloc(strlen(mystring)+strlen(tmp)+1);
-				strcpy(tempstring,mystring);
-				efree(mystring);
-				mystring=tempstring;
-				strcat(mystring,tmp);
-
-				bod=&part->body;
-
-				tempstring=emalloc(strlen(bod->contents.text.data)+strlen(mystring)+1);
-				strcpy(tempstring,mystring);
-				efree(mystring);
-				mystring=tempstring;
-				strcat(mystring,bod->contents.text.data);
-
-			} while ((part = part->next));/* until done */
-            /* output trailing cookie */
-
-			sprintf(tmp,"--%s--",cookie);
-			tempstring=emalloc(strlen(tmp)+strlen(mystring)+1);
-			strcpy(tempstring,mystring);
-			efree(mystring);
-			mystring=tempstring;
-			strcat(mystring,tmp);
-			break;
-		default:                      /* all else is text now */
-			tempstring=emalloc(strlen(bod->contents.text.data)+strlen(mystring)+1);
-			strcpy(tempstring,mystring);
-			efree(mystring);
-			mystring=tempstring;
-			strcat(mystring,bod->contents.text.data);
-			break;
-	}
-
-	RETURN_STRINGL(mystring,strlen(mystring),1);  
-}
-/* }}} */
-
-#if !(WIN32|WINNT)
-int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath)
-{
-#ifdef PHP_WIN32
-	int tsm_err;
-#else
-	FILE *sendmail;
-	int ret;
-#endif
-
-#ifdef PHP_WIN32
-	if (imap_TSendMail(INI_STR("smtp"),&tsm_err,headers,subject,to,message,cc,bcc,rpath) != SUCCESS){
-		php_error(E_WARNING, GetSMErrorText(tsm_err));
-		return 0;
-	}
-#else
-	if (!INI_STR("sendmail_path")) {
-		return 0;
-	}
-	sendmail = popen(INI_STR("sendmail_path"), "w");
-	if (sendmail) {
-		if (rpath && rpath[0]) fprintf(sendmail, "From: %s\n", rpath);
-		fprintf(sendmail, "To: %s\n", to);
-		if (cc && cc[0]) fprintf(sendmail, "Cc: %s\n", cc);
-		if (bcc && bcc[0]) fprintf(sendmail, "Bcc: %s\n", bcc);
-		fprintf(sendmail, "Subject: %s\n", subject);
-		if (headers != NULL) {
-			fprintf(sendmail, "%s\n", headers);
-		}
-		fprintf(sendmail, "\n%s\n", message);
-		ret = pclose(sendmail);
-		if (ret == -1) {
-			return 0;
-		} else {
-			return 1;
-		}
-	} else {
-		php_error(E_WARNING, "Could not execute mail delivery program");
-		return 0;
-	}
-#endif
-	return 1;
-}
-
-/* {{{ proto int imap_mail(string to, string subject, string message [, string additional_headers [, string cc [, string bcc [, string rpath]]]])
-   Send an email message */
-PHP_FUNCTION(imap_mail)
-{
-	pval *argv[6];
-	char *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *cc=NULL, *bcc=NULL, *rpath=NULL;
-	int argc;
-	
-	argc = ARG_COUNT(ht);
-	if (argc < 3 || argc > 7 || getParametersArray(ht, argc, argv) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	/* To: */
-	convert_to_string(argv[0]);
-	if (argv[0]->value.str.val) {
-		to = argv[0]->value.str.val;
-	} else {
-		php_error(E_WARNING, "No to field in mail command");
-		RETURN_FALSE;
-	}
-
-	/* Subject: */
-	convert_to_string(argv[1]);
-	if (argv[1]->value.str.val) {
-		subject = argv[1]->value.str.val;
-	} else {
-		php_error(E_WARNING, "No subject field in mail command");
-		RETURN_FALSE;
-	}
-
-	/* message body */
-	convert_to_string(argv[2]);
-	if (argv[2]->value.str.val) {
-		message = argv[2]->value.str.val;
-	} else {
-		/* this is not really an error, so it is allowed. */
-		php_error(E_WARNING, "No message string in mail command");
-		message = NULL;
-	}
-
-	/* other headers */
-	if (argc > 3) {
-		convert_to_string(argv[3]);
-		headers = argv[3]->value.str.val;
-	}
-	
-	/* cc */
-	if (argc > 4) {
-		convert_to_string(argv[4]);
-		cc = argv[4]->value.str.val;
-	}
-
-	/* bcc */
-	if (argc > 5) {
-		convert_to_string(argv[5]);
-		bcc = argv[5]->value.str.val;
-	}
-
-	/* rpath */
-	if (argc > 6) {
-		convert_to_string(argv[6]);
-		rpath = argv[6]->value.str.val;
-	}
-
-	if (_php_imap_mail(to, subject, message, headers, cc, bcc, rpath)){
-		RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-#endif
-
-/* {{{ proto array imap_search(int stream_id, string criteria [, long flags])
-   Return a list of messages matching the criteria */
-PHP_FUNCTION(imap_search)
-{
-	pval *streamind, *criteria, *search_flags;
-	int ind, ind_type, args;
-	pils *imap_le_struct;
-	long flags;
-	MESSAGELIST *cur;
-    
-	args = ARG_COUNT(ht);
-	if (args < 2 || args > 3 || getParameters(ht, args, &streamind, &criteria, &search_flags) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_long(streamind);
-	convert_to_string(criteria);
-	
-	if (args == 2) {
-		flags = SE_FREE;
-	} else {
-		convert_to_long(search_flags);
-		flags = search_flags->value.lval;
-	}
-	
-	ind = streamind->value.lval;
-	imap_le_struct = (pils *)zend_list_find(ind, &ind_type);
-	if (!imap_le_struct || !IS_STREAM(ind_type)) {
-		php_error(E_WARNING, "Unable to find stream pointer");
-		RETURN_FALSE;
-	}
-	
-	imap_messages = NIL;
-	mail_search_full(imap_le_struct->imap_stream, NIL, mail_criteria(criteria->value.str.val), flags);
-	if (imap_messages == NIL) {
-		RETURN_FALSE;
-	}
-	
-	array_init(return_value);
-	cur = imap_messages;
-	while (cur != NIL) {
-		add_next_index_long(return_value, cur->msgid);
-		cur = cur->next;
-	}
-	mail_free_messagelist(&imap_messages);
-}
-
-/* }}} */
-
-/* {{{ proto array imap_alerts(void)
-   Returns an array of all IMAP alerts that have been generated */
-/* Returns an array of all IMAP alerts that have been generated either
-   since the last page load, or since the last imap_alerts() call,
-   whichever came last. The alert stack is cleared after imap_alerts()
-   is called. */
-/* Author: CJH */
-PHP_FUNCTION(imap_alerts)
-{
-	STRINGLIST *cur=NIL;
-  
-	int arg_count = ARG_COUNT(ht);
-  
-	if (arg_count > 0) {
-		WRONG_PARAM_COUNT;
-	}
-  
-	if (imap_alertstack == NIL) {
-		RETURN_FALSE;
-	}
-  
-	array_init(return_value);
-	cur = imap_alertstack;
-	while (cur != NIL) {
-		add_next_index_string(return_value,cur->LTEXT,1);
-		cur = cur->next;
-	}
-	mail_free_stringlist(&imap_alertstack);
-	imap_alertstack = NIL;
-}
-/* }}} */
-
-/* {{{ proto array imap_errors(void)
-   Returns an array of all IMAP errors generated */
-/* Returns an array of all IMAP errors generated either since the last
-   page load, or since the last imap_errors() call, whichever came
-   last. The error stack is cleared after imap_errors() is called. */
-/* Author: CJH */
-PHP_FUNCTION(imap_errors)
-{
-	ERRORLIST *cur=NIL;
-  
-	int arg_count = ARG_COUNT(ht);
-  
-	if (arg_count > 0) {
-		WRONG_PARAM_COUNT;
-	}
-  
-	if (imap_errorstack == NIL) {
-		RETURN_FALSE;
-	}
-  
-	array_init(return_value);
-	cur = imap_errorstack;
-	while (cur != NIL) {
-		add_next_index_string(return_value,cur->LTEXT,1);
-		cur = cur->next;
-	}
-	mail_free_errorlist(&imap_errorstack);
-	imap_errorstack = NIL;
-}
-/* }}} */
-
-/* {{{ proto string imap_last_error(void) 
-   Returns the last error that was generated by an IMAP function. The error stack is NOT cleared after this call. */
-/* Author: CJH */
-PHP_FUNCTION(imap_last_error)
-{
-	ERRORLIST *cur=NIL;
-  
-	int arg_count = ARG_COUNT(ht);
-  
-	if (arg_count > 0) {
-		WRONG_PARAM_COUNT;
-	}
-  
-	if (imap_errorstack == NIL) {
-		RETURN_FALSE;
-	}
-  
-	cur = imap_errorstack;
-	while (cur != NIL) {
-		if (cur->next == NIL) {
-			RETURN_STRING(cur->LTEXT, 1);
-		}
-		cur = cur->next;
-	}
-}
-/* }}} */
-
-
-/* Support Functions */
-void _php_imap_parse_address (ADDRESS *addresslist, char *fulladdress, pval *paddress)
-{
-	ADDRESS *addresstmp, *addresstmp2;
-	char tempaddress[MAILTMPLEN];
-	pval *tmpvals;
-	int ok = 1;
-	
-	addresstmp = addresslist;
-	fulladdress[0] = 0x00;
-	while (ok && addresstmp) {                                    /* while length < 1000 and we are not at the end of the list */
-		addresstmp2 = addresstmp->next;                           /* save the pointer to the next address */
-		addresstmp->next = NULL;                                  /* make this address the only one now. */
-		tempaddress[0] = 0x00;                                    /* reset tempaddress buffer */
-		rfc822_write_address(tempaddress, addresstmp);            /* ok, write the address into tempaddress string */
-		if ((strlen(tempaddress) + strlen(fulladdress)) < 1000) { /* is the new address + total address < 1000 */
-			if (strlen(fulladdress)) strcat(fulladdress, ",");    /* put in a comma */ 
-			strcat(fulladdress, tempaddress);                     /* put in the new address */
-		} else {                                                  /* no */
-			ok = 0;                                               /* stop looping */
-			strcat(fulladdress, ", ..."); 
-		}
-		/* DO NOT optimize this out - changing it breaks things */
-		addresstmp->next = addresstmp2; /* reset the pointer to the next address first! */
-		addresstmp = addresstmp->next; 
-	}
-	
-	addresstmp = addresslist;
-	do {
-		MAKE_STD_ZVAL(tmpvals);
-		object_init(tmpvals);
-		if (addresstmp->personal) add_property_string(tmpvals, "personal", addresstmp->personal, 1);
-		if (addresstmp->adl) add_property_string(tmpvals, "adl", addresstmp->adl, 1);
-		if (addresstmp->mailbox) add_property_string(tmpvals, "mailbox", addresstmp->mailbox, 1);
-		if (addresstmp->host) add_property_string(tmpvals, "host", addresstmp->host, 1);
-		add_next_index_object(paddress, tmpvals);
-	} while ((addresstmp = addresstmp->next));
-}
-
-void _php_make_header_object(zval *myzvalue, ENVELOPE *en)
-{
-	zval *paddress;
-	char fulladdress[MAILTMPLEN];
-	
-	object_init(myzvalue);
-	
-    if (en->remail) add_property_string(myzvalue, "remail", en->remail,1);
-    if (en->date) add_property_string(myzvalue, "date", en->date,1);
-    if (en->date) add_property_string(myzvalue, "Date", en->date,1);
-    if (en->subject) add_property_string(myzvalue, "subject", en->subject,1);
-    if (en->subject) add_property_string(myzvalue, "Subject", en->subject,1);
-    if (en->in_reply_to) add_property_string(myzvalue, "in_reply_to", en->in_reply_to,1);
-    if (en->message_id) add_property_string(myzvalue, "message_id", en->message_id,1);
-    if (en->newsgroups) add_property_string(myzvalue, "newsgroups", en->newsgroups,1);
-    if (en->followup_to) add_property_string(myzvalue, "followup_to", en->followup_to,1);
-    if (en->references) add_property_string(myzvalue, "references", en->references,1);
-	
-	if (en->to) {
-		MAKE_STD_ZVAL(paddress);
-		array_init(paddress);
-		_php_imap_parse_address(en->to, fulladdress, paddress);
-		if (fulladdress) add_property_string(myzvalue, "toaddress", fulladdress, 1);
-		add_assoc_object(myzvalue, "to", paddress);
-	}
-	
-	if (en->from) {
-		MAKE_STD_ZVAL(paddress);
-		array_init(paddress);
-		_php_imap_parse_address(en->from, fulladdress, paddress);
-		if (fulladdress) add_property_string(myzvalue, "fromaddress", fulladdress, 1);
-		add_assoc_object(myzvalue, "from", paddress);
-	}
-	
-	if (en->cc) {
-		MAKE_STD_ZVAL(paddress);
-		array_init(paddress);
-		_php_imap_parse_address(en->cc, fulladdress, paddress);
-		if (fulladdress) add_property_string(myzvalue, "ccaddress", fulladdress, 1);
-		add_assoc_object(myzvalue, "cc", paddress);
-	}
-	
-	if (en->bcc) {
-		MAKE_STD_ZVAL(paddress);
-		array_init(paddress);
-		_php_imap_parse_address(en->bcc, fulladdress, paddress);
-		if (fulladdress) add_property_string(myzvalue, "bccaddress", fulladdress, 1);
-		add_assoc_object(myzvalue, "bcc", paddress);
-	}
-	
-	if (en->reply_to) {
-		MAKE_STD_ZVAL(paddress);
-		array_init(paddress);
-		_php_imap_parse_address(en->reply_to, fulladdress, paddress);
-		if (fulladdress) add_property_string(myzvalue, "reply_toaddress", fulladdress, 1);
-		add_assoc_object(myzvalue, "reply_to", paddress);
-	}
-
-	if (en->sender) {
-		MAKE_STD_ZVAL(paddress);
-		array_init(paddress);
-		_php_imap_parse_address(en->sender, fulladdress, paddress);
-		if (fulladdress) add_property_string(myzvalue, "senderaddress", fulladdress, 1);
-		add_assoc_object(myzvalue, "sender", paddress);
-	}
-
-	if (en->return_path) {
-		MAKE_STD_ZVAL(paddress);
-		array_init(paddress);
-		_php_imap_parse_address(en->return_path, fulladdress, paddress);
-		if (fulladdress) add_property_string(myzvalue, "return_pathaddress", fulladdress, 1);
-		add_assoc_object(myzvalue, "return_path", paddress);
-	}
-	
-}
-
-void _php_imap_add_body(pval *arg, BODY *body)
-{
-	pval *parametres, *param, *dparametres, *dparam;
-	PARAMETER *par, *dpar;
-	PART *part;
-	
-	if(body->type) add_property_long( arg, "type", body->type );
-	if(body->encoding) add_property_long( arg, "encoding", body->encoding );
-
-	if ( body->subtype ){
-		add_property_long( arg, "ifsubtype", 1 );
-		add_property_string( arg, "subtype",  body->subtype, 1 );
-	} else {
-		add_property_long( arg, "ifsubtype", 0 );
-	}
-
-	if ( body->description ){
-		add_property_long( arg, "ifdescription", 1 );
-		add_property_string( arg, "description",  body->description, 1 );
-	} else {
-		add_property_long( arg, "ifdescription", 0 );
-	}
-	if ( body->id ){
-		add_property_long( arg, "ifid", 1 );
-		add_property_string( arg, "id",  body->id, 1 );
-	} else {
-		add_property_long( arg, "ifid", 0 );
-	}
-	
-	if(body->size.lines) add_property_long( arg, "lines", body->size.lines );
-	if(body->size.bytes) add_property_long( arg, "bytes", body->size.bytes );
-#ifdef IMAP41
-	if ( body->disposition.type ){
-		add_property_long( arg, "ifdisposition", 1);
-		add_property_string( arg, "disposition", body->disposition.type, 1);
-	} else {
-		add_property_long( arg, "ifdisposition", 0);
-	}
-
-	if (body->disposition.parameter) {
-		dpar = body->disposition.parameter;
-		add_property_long( arg, "ifdparameters", 1);
-		MAKE_STD_ZVAL(dparametres);
-		array_init(dparametres);
-		do {
-			MAKE_STD_ZVAL(dparam);
-			object_init(dparam);
-			add_property_string(dparam, "attribute", dpar->attribute, 1);
-			add_property_string(dparam, "value", dpar->value, 1);
-			add_next_index_object(dparametres, dparam );
-        } while ( (dpar = dpar->next) );
-		add_assoc_object( arg, "dparameters", dparametres );
-	} else {
-		add_property_long( arg, "ifdparameters", 0);
-	}
-#endif
- 
-	if ((par = body->parameter)) {
-		add_property_long( arg, "ifparameters", 1);
-
-		MAKE_STD_ZVAL(parametres);
-		array_init(parametres);
-		do {
-			MAKE_STD_ZVAL(param);
-			object_init(param);
-			if(par->attribute) add_property_string(param, "attribute", par->attribute, 1 );
-			if(par->value) add_property_string(param, "value", par->value, 1 );
-
-			add_next_index_object(parametres, param);
-		} while ( (par = par->next) );
-	} else {
-		MAKE_STD_ZVAL(parametres);
-		object_init(parametres);
-		add_property_long( arg, "ifparameters", 0);
-	}
-	add_assoc_object( arg, "parameters", parametres );
-
-	/* multipart message ? */
-	if (body->type == TYPEMULTIPART) {
-		MAKE_STD_ZVAL(parametres);
-		array_init(parametres);
-		for (part = body->CONTENT_PART; part; part = part->next) {
-			MAKE_STD_ZVAL(param);
-			object_init(param);
-			_php_imap_add_body(param, &part->body);
-			add_next_index_object(parametres, param);
-		}
-		add_assoc_object(arg, "parts", parametres);
-	}
-	
-	/* encapsulated message ? */
-	if ((body->type == TYPEMESSAGE) && (!strcasecmp(body->subtype, "rfc822"))) {
-		body = body->CONTENT_MSG_BODY;
-		MAKE_STD_ZVAL(parametres);
-		array_init(parametres);
-		MAKE_STD_ZVAL(param);
-		object_init(param);
-		_php_imap_add_body(param, body);
-		add_next_index_object(parametres, param);
-		add_assoc_object(arg, "parts", parametres);
-	}
-}
-
-
-/* Interfaces to C-client */
-void mm_searched (MAILSTREAM *stream,unsigned long number)
-{
-	MESSAGELIST *cur = NIL;
-  
-	if (imap_messages == NIL) {
-		imap_messages = mail_newmessagelist();
-		imap_messages->msgid = number;
-		imap_messages->next = NIL;
-	} else {
-		cur = imap_messages;
-		while (cur->next != NIL) {
-			cur = cur->next;
-		}
-		cur->next = mail_newmessagelist();
-		cur = cur->next;
-		cur->msgid = number;
-		cur->next = NIL;
-	}
-}
-
-void mm_exists (MAILSTREAM *stream,unsigned long number)
-{
-}
-
-void mm_expunged (MAILSTREAM *stream,unsigned long number)
-{
-}
-
-void mm_flags (MAILSTREAM *stream,unsigned long number)
-{
-}
-
-/* Author: CJH */
-void mm_notify (MAILSTREAM *stream,char *str, long errflg)
-{
-	STRINGLIST *cur = NIL;
-  
-	if (strncmp(str, "[ALERT] ", 8) == 0) {
-		if (imap_alertstack == NIL) {
-			imap_alertstack = mail_newstringlist();
-			imap_alertstack->LSIZE = strlen(imap_alertstack->LTEXT = cpystr(str));
-			imap_alertstack->next = NIL; 
-		} else {
-			cur = imap_alertstack;
-			while (cur->next != NIL ) {
-				cur = cur->next;
-			}
-			cur->next = mail_newstringlist ();
-			cur = cur->next;
-			cur->LSIZE = strlen(cur->LTEXT = cpystr(str));
-			cur->next = NIL;
-		}
-	}
-}
-
-void mm_list (MAILSTREAM *stream,DTYPE delimiter,char *mailbox,long attributes)
-{
-	STRINGLIST *cur=NIL;
-	FOBJECTLIST *ocur=NIL;
-	
-	if (folderlist_style == FLIST_OBJECT) {
-		/* build up a the new array of objects */
-		/* Author: CJH */
-		if (imap_folder_objects == NIL) {
-			imap_folder_objects = mail_newfolderobjectlist();
-			imap_folder_objects->LSIZE=strlen(imap_folder_objects->LTEXT=cpystr(mailbox));
-			imap_folder_objects->delimiter = delimiter;
-			imap_folder_objects->attributes = attributes;
-			imap_folder_objects->next = NIL;
-		} else {
-			ocur=imap_folder_objects;
-			while (ocur->next != NIL) {
-				ocur=ocur->next;
-			}
-			ocur->next=mail_newfolderobjectlist();
-			ocur=ocur->next;
-			ocur->LSIZE = strlen(ocur->LTEXT = cpystr(mailbox));
-			ocur->delimiter = delimiter;
-			ocur->attributes = attributes;
-			ocur->next = NIL;
-		}
-		
-	} else {
-		/* build the old imap_folders variable to allow old imap_listmailbox() to work */
-		if (!(attributes & LATT_NOSELECT)) {
-			if (imap_folders == NIL) {
-				imap_folders=mail_newstringlist();
-				imap_folders->LSIZE=strlen(imap_folders->LTEXT=cpystr(mailbox));
-				imap_folders->next=NIL; 
-			} else {
-				cur=imap_folders;
-				while (cur->next != NIL ) {
-					cur=cur->next;
-				}
-				cur->next=mail_newstringlist ();
-				cur=cur->next;
-				cur->LSIZE = strlen (cur->LTEXT = cpystr (mailbox));
-				cur->next = NIL;
-			}
-		}
-	}
-}
-
-void mm_lsub (MAILSTREAM *stream,DTYPE delimiter,char *mailbox,long attributes)
-{
-	STRINGLIST *cur=NIL;
-	FOBJECTLIST *ocur=NIL;
-	
-	if (folderlist_style == FLIST_OBJECT) {
-		/* build the array of objects */
-		/* Author: CJH */
-		if (imap_sfolder_objects == NIL) {
-			imap_sfolder_objects = mail_newfolderobjectlist();
-			imap_sfolder_objects->LSIZE=strlen(imap_sfolder_objects->LTEXT=cpystr(mailbox));
-			imap_sfolder_objects->delimiter = delimiter;
-			imap_sfolder_objects->attributes = attributes;
-			imap_sfolder_objects->next = NIL;
-		} else {
-			ocur=imap_sfolder_objects;
-			while (ocur->next != NIL) {
-				ocur=ocur->next;
-			}
-			ocur->next=mail_newfolderobjectlist();
-			ocur=ocur->next;
-			ocur->LSIZE=strlen(ocur->LTEXT = cpystr(mailbox));
-			ocur->delimiter = delimiter;
-			ocur->attributes = attributes;
-			ocur->next = NIL;
-		}
-	} else {
-		/* build the old simple array for imap_listsubscribed() */
-		if (imap_sfolders == NIL) {
-			imap_sfolders=mail_newstringlist();
-			imap_sfolders->LSIZE=strlen(imap_sfolders->LTEXT=cpystr(mailbox));
-			imap_sfolders->next=NIL; 
-		} else {
-			cur=imap_sfolders;
-			while (cur->next != NIL ) {
-				cur=cur->next;
-			}
-			cur->next=mail_newstringlist ();
-			cur=cur->next;
-			cur->LSIZE = strlen (cur->LTEXT = cpystr (mailbox));
-			cur->next = NIL;
-		}
-	}
-}
-
-void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
-{
-	status_flags=status->flags;
-	if(status_flags & SA_MESSAGES) status_messages=status->messages;
-	if(status_flags & SA_RECENT) status_recent=status->recent;
-	if(status_flags & SA_UNSEEN) status_unseen=status->unseen;
-	if(status_flags & SA_UIDNEXT) status_uidnext=status->uidnext;
-	if(status_flags & SA_UIDVALIDITY) status_uidvalidity=status->uidvalidity;
-
-#ifdef SA_QUOTA
-	if(status_flags & SA_QUOTA) status_quota=status->quota;
-#endif
-#ifdef SA_QUOTA_ALL
-	if(status_flags & SA_QUOTA_ALL) status_quota_all=status->quota_all;
-#endif
-}
-
-void mm_log (char *str,long errflg)
-{
-	ERRORLIST *cur = NIL;
-  
-	/* Author: CJH */
-	if (errflg != NIL) { /* CJH: maybe put these into a more comprehensive log for debugging purposes? */
-		if (imap_errorstack == NIL) {
-			imap_errorstack = mail_newerrorlist();
-			imap_errorstack->LSIZE = strlen(imap_errorstack->LTEXT = cpystr(str));
-			imap_errorstack->errflg = errflg;
-			imap_errorstack->next = NIL; 
-		} else {
-			cur = imap_errorstack;
-			while (cur->next != NIL ) {
-				cur = cur->next;
-			}
-			cur->next = mail_newerrorlist ();
-			cur = cur->next;
-			cur->LSIZE = strlen(cur->LTEXT = cpystr(str));
-			cur->errflg = errflg;
-			cur->next = NIL;
-		}
-	}
-}
-
-void mm_dlog (char *str)
-{
-	/* CJH: this is for debugging; it might be useful to allow setting
-	   the stream to debug mode and capturing this somewhere - syslog?
-	   php debugger? */
-}
-
-void mm_login (NETMBX *mb,char *user,char *pwd,long trial)
-{
-#if HAVE_IMSP
-	if (*mb->service && strcmp(mb->service, "imsp") == 0) {
-		if (*mb->user) {
-			strcpy(user, mb->user);
-		} else {
-			strcpy(user, imsp_user);
-		}
-		strcpy (pwd,imsp_password);
-	} else {
-#endif
-		if (*mb->user) {
-			strcpy (user,mb->user);
-		} else {
-			strcpy (user,imap_user);
-		}
-		strcpy (pwd,imap_password);
-#if HAVE_IMSP
-	}
-#endif
-}
-
-void mm_critical (MAILSTREAM *stream)
-{
-}
-
-void mm_nocritical (MAILSTREAM *stream)
-{
-}
-
-long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
-{
-	return 1;
-}
-
-void mm_fatal (char *str)
-{
-}
-
-/* {{{ proto array imap_mime_header_decode(string str)
-   Decode mime header element in accordance with RFC 2047 and return array of objects containing 'charset' encoding and decoded 'text' */
-PHP_FUNCTION(imap_mime_header_decode)
-{
-	zval **str,*myobject;
-	char *string,*charset,encoding,*text,*decode;
-	long charset_token,encoding_token,end_token,end,offset=0,i;
-	long unsigned newlength;
-
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_string_ex(str);
-
-	if (array_init(return_value) == FAILURE) {
-		RETURN_FALSE;
-	}
-
-	string=(*str)->value.str.val;
-	end=(*str)->value.str.len;
-			
-	if((charset=((char *)emalloc((end+1)*2)))) {
-		text=&charset[end+1];
-		while(offset<end) {													// Reached end of the string?
-			if((charset_token=php_memnstr(&string[offset],"=?",2,string+end))) {		// Is there anything encoded in the string?
-				charset_token-=(long unsigned)string;
-				if(offset!=charset_token) {										// Is there anything before the encoded data?
-					// Retrieve unencoded data that is found at the beginning
-					memcpy(text,&string[offset],charset_token-offset);
-					text[charset_token-offset]=0x00;
-					MAKE_STD_ZVAL(myobject);
-					object_init(myobject);
-					add_property_string(myobject,"charset","default",1);
-					add_property_string(myobject,"text",text,1);
-					zend_hash_next_index_insert(return_value->value.ht,(void *)&myobject,sizeof(zval *),NULL);
-				}
-				if((encoding_token=php_memnstr(&string[charset_token+2],"?",1,string+end))) {			// Find token for encoding
-					encoding_token-=(long unsigned)string;
-					if((end_token=php_memnstr(&string[encoding_token+1],"?=",2,string+end))) {		// Find token for end of encoded data
-						end_token-=(long unsigned)string;
-						memcpy(charset,&string[charset_token+2],encoding_token-(charset_token+2));	// Extract charset encoding
-						charset[encoding_token-(charset_token+2)]=0x00;
-						encoding=string[encoding_token+1];										// Extract encoding from string
-						memcpy(text,&string[encoding_token+3],end_token-(encoding_token+3));		// Extract text
-						text[end_token-(encoding_token+3)]=0x00;
-						decode=text;
-						if(encoding=='q' || encoding=='Q') {										// Decode 'q' encoded data
-							for(i=0;text[i]!=0x00;i++) if(text[i]=='_') text[i]=' ';							// Replace all *_' with space.
-							decode = (char *) rfc822_qprint((unsigned char *) text, strlen(text),&newlength);
-						}
-						if(encoding=='b' || encoding=='B') decode = (char *) rfc822_base64((unsigned char *) text, strlen(text),&newlength); // Decode 'B' encoded data
-						MAKE_STD_ZVAL(myobject);
-						object_init(myobject);
-						add_property_string(myobject,"charset",charset,1);
-						add_property_string(myobject,"text",decode,1);
-						zend_hash_next_index_insert(return_value->value.ht,(void *)&myobject,sizeof(zval *),NULL);
-						
-						offset+=end_token+2;
-						if(string[offset]==' ' && string[offset+1]=='=' && string[offset+2]=='?') offset++;	// Remove required space between encoded segments
-						continue;								// Iterate the loop again please.
-					}
-				}
-			} else {
-				// Just some tweaking to optimize the code, and get the end statements work in a general manner.
-				// If we end up here we didn't find a position for "charset_token",
-				// so we need to set it to the start of the yet unextracted data.
-				charset_token=offset;
-			}
-			// Return the rest of the data as unencoded, as it was either unencoded or was missing separators
-			// which rendered the the remainder of the string impossible for us to decode.
-			memcpy(text,&string[charset_token],end-charset_token);		// Extract unencoded text from string
-			text[end-charset_token]=0x00;
-			MAKE_STD_ZVAL(myobject);
-			object_init(myobject);
-			add_property_string(myobject,"charset","default",1);
-			add_property_string(myobject,"text",text,1);
-			zend_hash_next_index_insert(return_value->value.ht,(void *)&myobject,sizeof(zval *),NULL);
-			
-			offset=end;	// We have reached the end of the string.
-		}
-		efree(charset);
-	} else {
-		php_error(E_WARNING, "Unable to allocate temporary memory buffer for imap_mime_header_decode");
-		RETURN_FALSE;
-	}
-}
-
-#endif
diff --git a/ext/imap/imap.dsp b/ext/imap/imap.dsp
index b56f29c336..5b4c49994d 100644
--- a/ext/imap/imap.dsp
+++ b/ext/imap/imap.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\IMAP\c-client" /I "..\..\TSRM" /D "NDEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x40d /d "NDEBUG"

@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 c-client.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib /nologo /dll /machine:I386 /libpath:"..\..\Debug_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /machine:I386 /libpath:"..\..\Release" /libpath:"..\..\..\php_build\IMAP\C-Client"

 

 !ELSEIF  "$(CFG)" == "imap - Win32 Debug"

 

@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\IMAP\c-client" /I "..\..\TSRM" /D "_DEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /FR /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x40d /d "_DEBUG"

@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 c-client.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\IMAP\C-Client"

 

 !ELSEIF  "$(CFG)" == "imap - Win32 Debug_TS"

 

@@ -95,7 +95,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /FR /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "ZTS" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\IMAP\c-client" /I "..\..\TSRM" /D "ZTS" /D "_DEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /FR /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x40d /d "_DEBUG"

@@ -105,7 +105,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\IMAP\C-Client"

 

 !ELSEIF  "$(CFG)" == "imap - Win32 Release_TS"

 

@@ -118,9 +118,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release_TS"

 # PROP Intermediate_Dir "Release_TS"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "ZTS" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\IMAP\c-client" /I "..\..\TSRM" /D "ZTS" /D "NDEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x40d /d "NDEBUG"

@@ -130,7 +131,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 c-client.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib /nologo /dll /machine:I386 /libpath:"..\..\Debug_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\IMAP\C-Client"

 

 !ENDIF 

 

@@ -157,97 +158,5 @@ SOURCE=.\imap.c
 SOURCE=.\imap.h

 # End Source File

 # End Group

-# Begin Group "IMAP"

-

-# PROP Default_Filter ""

-# Begin Group "Source Files No. 1"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\dummynt.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\fdstring.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\flstring.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\imap4r1.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\mail.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\mbxnt.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\misc.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\mtxnt.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\netmsg.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\newsrc.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\nntp.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\os_nt.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\pop3.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\pseudo.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\rfc822.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\smanager.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\smtp.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\tenexnt.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\unixnt.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\..\Imap\c-client\utf8.c"

-# End Source File

-# End Group

-# Begin Group "Header Files No. 1"

-

-# PROP Default_Filter ""

-# End Group

-# End Group

 # End Target

 # End Project

diff --git a/ext/imap/imap.h b/ext/imap/imap.h
deleted file mode 100644
index ebc2361378..0000000000
--- a/ext/imap/imap.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef _INCLUDED_IMAP_H
-#define _INCLUDED_IMAP_H
-
-#if COMPILE_DL
-#undef HAVE_IMAP
-#define HAVE_IMAP 1
-#endif
-
-#if HAVE_IMAP
-
-#ifndef PHP_WIN32
-#include "build-defs.h"
-#endif
-
-/* Functions accessable to PHP */
-extern zend_module_entry imap_module_entry;
-#define imap_module_ptr &imap_module_entry
-
-extern PHP_MINIT_FUNCTION(imap);
-extern PHP_RINIT_FUNCTION(imap);
-extern PHP_RSHUTDOWN_FUNCTION(imap);
-PHP_MINFO_FUNCTION(imap);
-PHP_FUNCTION(imap_open);
-PHP_FUNCTION(imap_popen);
-PHP_FUNCTION(imap_reopen);
-PHP_FUNCTION(imap_num_msg);
-PHP_FUNCTION(imap_num_recent);
-PHP_FUNCTION(imap_headers);
-PHP_FUNCTION(imap_headerinfo);
-PHP_FUNCTION(imap_rfc822_parse_headers);
-PHP_FUNCTION(imap_body);
-PHP_FUNCTION(imap_fetchstructure);
-PHP_FUNCTION(imap_fetchbody);
-PHP_FUNCTION(imap_expunge);
-PHP_FUNCTION(imap_delete);
-PHP_FUNCTION(imap_undelete);
-PHP_FUNCTION(imap_check);
-PHP_FUNCTION(imap_close);
-PHP_FUNCTION(imap_mail_copy);
-PHP_FUNCTION(imap_mail_move);
-PHP_FUNCTION(imap_createmailbox);
-PHP_FUNCTION(imap_renamemailbox);
-PHP_FUNCTION(imap_deletemailbox);
-PHP_FUNCTION(imap_listmailbox);
-PHP_FUNCTION(imap_scanmailbox);
-PHP_FUNCTION(imap_subscribe);
-PHP_FUNCTION(imap_unsubscribe);
-PHP_FUNCTION(imap_append);
-PHP_FUNCTION(imap_ping);
-PHP_FUNCTION(imap_base64);
-PHP_FUNCTION(imap_qprint);
-PHP_FUNCTION(imap_8bit);
-PHP_FUNCTION(imap_binary);
-PHP_FUNCTION(imap_mailboxmsginfo);
-PHP_FUNCTION(imap_rfc822_write_address);
-PHP_FUNCTION(imap_rfc822_parse_adrlist);
-PHP_FUNCTION(imap_setflag_full);
-PHP_FUNCTION(imap_clearflag_full);
-PHP_FUNCTION(imap_sort);
-PHP_FUNCTION(imap_fetchheader);
-PHP_FUNCTION(imap_fetchtext);
-PHP_FUNCTION(imap_uid);
-PHP_FUNCTION(imap_msgno);
-PHP_FUNCTION(imap_list);
-PHP_FUNCTION(imap_list_full);
-PHP_FUNCTION(imap_listscan);
-PHP_FUNCTION(imap_lsub);
-PHP_FUNCTION(imap_lsub_full);
-PHP_FUNCTION(imap_create);
-PHP_FUNCTION(imap_rename);
-PHP_FUNCTION(imap_status);
-PHP_FUNCTION(imap_bodystruct);
-PHP_FUNCTION(imap_fetch_overview);
-PHP_FUNCTION(imap_mail_compose);
-PHP_FUNCTION(imap_alerts);
-PHP_FUNCTION(imap_errors);
-PHP_FUNCTION(imap_last_error);
-#ifndef PHP_WIN32
-PHP_FUNCTION(imap_mail);
-#endif
-PHP_FUNCTION(imap_search);
-PHP_FUNCTION(imap_utf8);
-PHP_FUNCTION(imap_utf7_decode);
-PHP_FUNCTION(imap_utf7_encode);
-PHP_FUNCTION(imap_mime_header_decode);
-#else
-#define imap_module_ptr NULL
-#endif /* HAVE_IMAP */
-
-#endif
-
-
-
-
-
-
-#define phpext_imap_ptr imap_module_ptr
-
-
-
-
-
-
-
-
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index d9ebd79f6a..5980a53bc9 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -16,6 +16,7 @@
    |          Eric Warnke    <ericw@albany.edu>                           |
    |          Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
    |          Gerrit Thomson <334647@swin.edu.au>                         |
+   | PHP 4.0 updates:  Zeev Suraski <zeev@zend.com>                       |
    +----------------------------------------------------------------------+
  */
  
@@ -24,10 +25,8 @@
 #define IS_EXT_MODULE
 
 #include "php.h"
+#include "php_ini.h"
 
-#if HAVE_LDAP
-
-#include "dl/phpdl.h"
 #include "ext/standard/dl.h"
 #include "php_ldap.h"
 
@@ -47,18 +46,11 @@
 #include "ext/standard/php_string.h"
 
 
-#if THREAD_SAFE & HAVE_NSLDAP
-#include "php3_threads.h"
-/* Structure for LDAP error values */
-#define LDAP_TLS_VARS ldap_module *PHP3_TLS_GET(ldapTLS,php_ldap_module)
-#define LDAP_GLOBAL(a) php_ldap_module->a
-#else
-#define LDAP_TLS_VARS
-#define LDAP_GLOBAL(a) php_ldap_module.a
-ldap_module php_ldap_module;
-#endif
+ZEND_DECLARE_MODULE_GLOBALS(ldap)
 
 
+static int le_result, le_result_entry, le_ber_entry;
+static int le_link;
 
 /*
 	This is just a small subset of the functionality provided by the LDAP library. All the 
@@ -104,159 +96,60 @@ zend_module_entry ldap_module_entry = {
 
 
 
-#if COMPILE_DL
-DLEXPORT zend_module_entry *get_module(void ) { return &ldap_module_entry; }
+#ifdef COMPILE_DL_LDAP
+ZEND_DLEXPORT zend_module_entry *get_module(void ) { return &ldap_module_entry; }
 #endif
 
 
-#if 0 /* see my note in php_ldap.h.  smc */
-/* Function for setting thread-specific LDAP error values */
-static void php_ldap_set_ld_error( int err, char *matched, char *errmsg, void *dummy )
+static void _close_ldap_link(LDAP *ld)
 {
-	LDAP_TLS_VARS;
-
-   /* Set the error code returned by the LDAP operation */
-   LDAP_GLOBAL(le_errno) = err;
-   /* Specify the components of the DN that matched (if 
-      an "NO_SUCH_OBJECT" error occurred */
-   if ( LDAP_GLOBAL(le_matched) != NULL ) {
-      ldap_memfree( LDAP_GLOBAL(le_matched) );
-   }
-   LDAP_GLOBAL(le_matched) = matched;
-   /* Specify the error message corresponding to the error code */
-   if ( LDAP_GLOBAL(le_errmsg) != NULL ) {
-      ldap_memfree( LDAP_GLOBAL(le_errmsg) );
-   }
-   LDAP_GLOBAL(le_errmsg) = errmsg;
-}
+	LDAPLS_FETCH();
 
-/* Function for getting the thread-specific LDAP error values */
-static int php_ldap_get_ld_error( char **matched, char **errmsg, void *dummy )
-{
-	LDAP_TLS_VARS;
-   /* Retrieve the error values */
-   if ( matched != NULL ) {
-      *matched = LDAP_GLOBAL(le_matched);
-   }
-   if ( errmsg != NULL ) {
-      *errmsg = LDAP_GLOBAL(le_errmsg);
-   }
-   return( LDAP_GLOBAL(le_errno) );
+	ldap_unbind_s(ld);
+	/* php_printf("Freeing ldap connection");*/
+	LDAPG(num_links)--;
 }
 
-/* Function for setting the value of the errno variable */
-static void php_ldap_set_errno( int err )
-{
-   errno = err;
-}
 
-/* Function for getting the value of the errno variable */
-static int php_ldap_get_errno( void )
+static void _free_ldap_result(LDAPMessage *result)
 {
-   return( errno );
+	ldap_msgfree(result);
 }
-#endif /* THREAD_SAFE && NSLDAP */
 
-static void _close_ldap_link(LDAP *ld)
-{
-	LDAP_TLS_VARS;
-  	ldap_unbind_s(ld);
-	/* php_printf("Freeing ldap connection");*/
-	LDAP_GLOBAL(num_links)--;
-}
 
+PHP_INI_BEGIN()
+	STD_PHP_INI_ENTRY_EX("ldap.max_links",		"-1",	PHP_INI_SYSTEM,			OnUpdateInt,		max_links,			zend_ldap_globals,		ldap_globals,	display_link_numbers)
+	STD_PHP_INI_ENTRY("mysql.base_dn",			NULL,	PHP_INI_ALL,			OnUpdateString,		base_dn,			zend_ldap_globals,		ldap_globals)
+PHP_INI_END()
 
-static void _free_ldap_result(LDAPMessage *result)
+
+static void php_ldap_init_globals(zend_ldap_globals *ldap_globals)
 {
-        ldap_msgfree(result);
+	ldap_globals->num_links = 0;
 }
 
+
 PHP_MINIT_FUNCTION(ldap)
 {
-#if defined(THREAD_SAFE)
-	ldap_module	*php_ldap_module;
-	PHP_MUTEX_ALLOC(ldap_mutex);
-	PHP_MUTEX_LOCK(ldap_mutex);
-	numthreads++;
-	if (numthreads==1){
-		if (!PHP3_TLS_PROC_STARTUP(ldapTLS)){
-			PHP_MUTEX_UNLOCK(ldap_mutex);
-			PHP_MUTEX_FREE(ldap_mutex);
-			return 0;
-		}
-	}
-	PHP_MUTEX_UNLOCK(ldap_mutex);
-	if(!PHP3_TLS_THREAD_INIT(ldapTLS,php_ldap_module,ldap_module))
-		return 0;
-#if 0 /*HAVE_NSLDAP*/
-   /* Set up the ldap_thread_fns structure with pointers 
-      to the functions that you want called */
-   memset( &LDAP_GLOBAL(tfns), '\0', sizeof(struct ldap_thread_fns) );
-   /* Specify the functions that you want called */
-   /* Call the my_mutex_alloc() function whenever mutexes 
-      need to be allocated */
-   LDAP_GLOBAL(tfns).ltf_mutex_alloc = (void *(*)(void)) php3_mutex_alloc;
-   /* Call the my_mutex_free() function whenever mutexes 
-      need to be destroyed */
-   LDAP_GLOBAL(tfns).ltf_mutex_free = (void (*)(void *)) php3_mutex_free;
-   /* Call the pthread_mutex_lock() function whenever a 
-      thread needs to lock a mutex. */
-   LDAP_GLOBAL(tfns).ltf_mutex_lock = (int (*)(void *)) php3_mutex_lock;
-   /* Call the pthread_mutex_unlock() function whenever a 
-      thread needs to unlock a mutex. */
-   LDAP_GLOBAL(tfns).ltf_mutex_unlock = (int (*)(void *)) php3_mutex_unlock;
-   /* Call the get_errno() function to get the value of errno */
-   LDAP_GLOBAL(tfns).ltf_get_errno = php_ldap_get_errno;
-   /* Call the set_errno() function to set the value of errno */
-   LDAP_GLOBAL(tfns).ltf_set_errno = php_ldap_set_errno;
-   /* Call the get_ld_error() function to get error values from 
-      calls to functions in the libldap library */
-   LDAP_GLOBAL(tfns).ltf_get_lderrno = php_ldap_get_ld_error;
-   /* Call the set_ld_error() function to set error values for 
-      calls to functions in the libldap library */
-   LDAP_GLOBAL(tfns).ltf_set_lderrno = php_ldap_set_ld_error;
-   /* Don't pass any extra parameter to the functions for 
-     getting and setting libldap function call errors */
-   LDAP_GLOBAL(tfns).ltf_lderrno_arg = NULL;
-/* Set the session option that specifies the functions to call for multi-threaded clients */
-	if (ldap_set_option( ld, LDAP_OPT_THREAD_FN_PTRS, (void *) &LDAP_GLOBAL(tfns))!= 0) {
-		ldap_perror( ld, "ldap_set_option: thread pointers" );
-	}
-#endif
-#endif
-	if (cfg_get_long("ldap.max_links", &LDAP_GLOBAL(max_links)) == FAILURE) {
-		LDAP_GLOBAL(max_links) = -1;
-	}
+	ZEND_INIT_MODULE_GLOBALS(ldap, php_ldap_init_globals, NULL);
 
-	if (cfg_get_string("ldap.base_dn", &LDAP_GLOBAL(base_dn)) == FAILURE) {
-		LDAP_GLOBAL(base_dn) = NULL;
-	}
+	REGISTER_INI_ENTRIES();
 
-	LDAP_GLOBAL(le_result) = register_list_destructors(_free_ldap_result, NULL);
-	LDAP_GLOBAL(le_link) = register_list_destructors(_close_ldap_link, NULL);
+	le_result = register_list_destructors(_free_ldap_result, NULL);
+	le_link = register_list_destructors(_close_ldap_link, NULL);
 
-	/*FIXME is this safe in threaded environment? if so, please comment*/
 	ldap_module_entry.type = type;
 
 	return SUCCESS;
 }
 
+
 PHP_MSHUTDOWN_FUNCTION(ldap)
 {
-#ifdef THREAD_SAFE
-	LDAP_TLS_VARS;
-	PHP3_TLS_THREAD_FREE(php_ldap_module);
-	PHP_MUTEX_LOCK(ldap_mutex);
-	numthreads--;
-	if (!numthreads) {
-		PHP3_TLS_PROC_SHUTDOWN(ldapTLS);
-	}
-	PHP_MUTEX_UNLOCK(ldap_mutex);
-	PHP_MUTEX_FREE(ldap_mutex);
-#endif
 	return SUCCESS;
 }
 
+
 PHP_MINFO_FUNCTION(ldap)
 {
 	char maxl[16];
@@ -266,12 +159,12 @@ PHP_MINFO_FUNCTION(ldap)
 	/* Print version information */
 	SDKVersion = ldap_version( &ver );
 #endif
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
-	if (LDAP_GLOBAL(max_links) == -1) {
+	if (LDAPG(max_links) == -1) {
 		strcpy(maxl, "Unlimited");
 	} else {
-		snprintf(maxl, 15, "%ld", LDAP_GLOBAL(max_links));
+		snprintf(maxl, 15, "%ld", LDAPG(max_links));
 		maxl[15] = 0;
 	}
 
@@ -283,7 +176,7 @@ PHP_MINFO_FUNCTION(ldap)
 				"<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>"
 				"<tr><td>SSL Level Supported:</td><td>%f</td></tr>"
 #endif
-				,LDAP_GLOBAL(num_links),maxl
+				,LDAPG(num_links), maxl
 #if HAVE_NSLDAP
 				,SDKVersion/100.0,ver.protocol_version/100.0,ver.SSL_version/100.0
 #endif
@@ -308,7 +201,7 @@ PHP_FUNCTION(ldap_connect)
 	/*	char *hashed_details;
 	int hashed_details_length;*/
 	LDAP *ldap;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	switch(ARG_COUNT(ht)) {
 		case 0: 
@@ -359,16 +252,16 @@ PHP_FUNCTION(ldap_connect)
 			break;
 	}
 
-	if (LDAP_GLOBAL(max_links)!=-1 && LDAP_GLOBAL(num_links)>=LDAP_GLOBAL(max_links)) {
-	  php_error(E_WARNING, "LDAP: Too many open links (%d)", LDAP_GLOBAL(num_links));
-	  RETURN_FALSE;
+	if (LDAPG(max_links)!=-1 && LDAPG(num_links)>=LDAPG(max_links)) {
+		php_error(E_WARNING, "LDAP: Too many open links (%d)", LDAPG(num_links));
+		RETURN_FALSE;
 	}
 
 	ldap = ldap_open(host,port);
 	if ( ldap == NULL ) {
-	  RETURN_FALSE;
+		RETURN_FALSE;
 	} else {
-	  RETURN_LONG(zend_list_insert((void*)ldap,LDAP_GLOBAL(le_link)));
+		RETURN_LONG(zend_list_insert((void*)ldap,le_link));
 	}
 
 }
@@ -379,12 +272,12 @@ static LDAP * _get_ldap_link(pval **link)
 {
 	LDAP *ldap;
 	int type;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	convert_to_long_ex(link);
 	ldap = (LDAP *) zend_list_find((*link)->value.lval, &type);
 	
-	if (!ldap || !(type == LDAP_GLOBAL(le_link))) {
+	if (!ldap || !(type == le_link)) {
 	  php_error(E_WARNING, "%d is not a LDAP link index",(*link)->value.lval);
 	  return NULL;
 	}
@@ -396,12 +289,12 @@ static LDAPMessage * _get_ldap_result(pval **result)
 {
 	LDAPMessage *ldap_result;
 	int type;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	convert_to_long_ex(result);
 	ldap_result = (LDAPMessage *)zend_list_find((*result)->value.lval, &type);
 
-	if (!ldap_result || type != LDAP_GLOBAL(le_result)) {
+	if (!ldap_result || type != le_result) {
 		php_error(E_WARNING, "%d is not a LDAP result index",(*result)->value.lval);
 		return NULL;
 	}
@@ -414,12 +307,12 @@ static LDAPMessage * _get_ldap_result_entry(pval **result)
 {
 	LDAPMessage *ldap_result_entry;
 	int type;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	convert_to_long_ex(result);
 	ldap_result_entry = (LDAPMessage *)zend_list_find((*result)->value.lval, &type);
 
-	if (!ldap_result_entry || type != LDAP_GLOBAL(le_result_entry)) {
+	if (!ldap_result_entry || type != le_result_entry) {
 		php_error(E_WARNING, "%d is not a LDAP result entry index", (*result)->value.lval);
 		return NULL;
 	}
@@ -432,12 +325,12 @@ static BerElement * _get_ber_entry(pval **berp)
 {
 	BerElement *ber;
 	int type;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	convert_to_long_ex(berp);
 	ber = (BerElement *) zend_list_find((*berp)->value.lval, &type);
 
-	if ( type != LDAP_GLOBAL(le_ber_entry)) {
+	if ( type != le_ber_entry) {
 		php_error(E_WARNING, "%d is not a BerElement index",(*berp)->value.lval);
 		return NULL;
 	}
@@ -546,7 +439,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 	int attrsonly;
 	LDAPMessage *ldap_result;
 	int num_attribs=0, i;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	switch(ARG_COUNT(ht)) {
 		case 3 :
@@ -628,7 +521,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 #endif
 		RETVAL_FALSE;
 	} else  {
-		RETVAL_LONG(zend_list_insert(ldap_result, LDAP_GLOBAL(le_result)));
+		RETVAL_LONG(zend_list_insert(ldap_result, le_result));
 	}
 
 	if (ldap_attrs != NULL) {
@@ -715,7 +608,7 @@ PHP_FUNCTION(ldap_first_entry)
 	LDAP *ldap;
 	LDAPMessage *ldap_result;
 	LDAPMessage *ldap_result_entry;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link, &result) == FAILURE) {
 		WRONG_PARAM_COUNT;
@@ -730,7 +623,7 @@ PHP_FUNCTION(ldap_first_entry)
 	if ((ldap_result_entry = ldap_first_entry(ldap, ldap_result)) == NULL) {
 		RETURN_FALSE;
 	} else {
-		RETURN_LONG(zend_list_insert(ldap_result_entry, LDAP_GLOBAL(le_result_entry)));
+		RETURN_LONG(zend_list_insert(ldap_result_entry, le_result_entry));
 	}
 }
 /* }}} */
@@ -742,7 +635,7 @@ PHP_FUNCTION(ldap_next_entry)
 	pval **result_entry, **link;
 	LDAP *ldap;
 	LDAPMessage *ldap_result_entry, *ldap_result_entry_next;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &link,&result_entry) == FAILURE) {
 		WRONG_PARAM_COUNT;
@@ -757,7 +650,7 @@ PHP_FUNCTION(ldap_next_entry)
 	if ((ldap_result_entry_next = ldap_next_entry(ldap, ldap_result_entry)) == NULL) {
 		RETURN_FALSE;
 	} else {
-		RETURN_LONG(zend_list_insert(ldap_result_entry_next, LDAP_GLOBAL(le_result_entry)));
+		RETURN_LONG(zend_list_insert(ldap_result_entry_next, le_result_entry));
 	}
 }
 /* }}} */
@@ -858,7 +751,7 @@ PHP_FUNCTION(ldap_first_attribute)
 	LDAPMessage *ldap_result_entry;
 	BerElement *ber;
 	char *attribute;
-	LDAP_TLS_VARS;
+	LDAPLS_FETCH();
 
 	if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &link,&result,&berp) == FAILURE || ParameterPassedByReference(ht,3)==0 ) {
 		WRONG_PARAM_COUNT;
@@ -875,7 +768,7 @@ PHP_FUNCTION(ldap_first_attribute)
 	} else {
 		/* brep is passed by ref so we do not have to account for memory */
 		(*berp)->type=IS_LONG;
-		(*berp)->value.lval=zend_list_insert(ber,LDAP_GLOBAL(le_ber_entry));
+		(*berp)->value.lval=zend_list_insert(ber,le_ber_entry);
 
 		RETVAL_STRING(attribute,1);
 #ifdef WINDOWS
@@ -1302,4 +1195,3 @@ PHP_FUNCTION(ldap_delete)
 }
 /* }}} */
 
-#endif
diff --git a/ext/ldap/ldap.dsp b/ext/ldap/ldap.dsp
new file mode 100644
index 0000000000..0747aaacc5
--- /dev/null
+++ b/ext/ldap/ldap.dsp
@@ -0,0 +1,167 @@
+# Microsoft Developer Studio Project File - Name="ldap" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=ldap - Win32 Debug_TS

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "ldap.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "ldap.mak" CFG="ldap - Win32 Debug_TS"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "ldap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ldap - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ldap - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "ldap - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\openldap\include" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1 /D "COMPILE_DL_LDAP" /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

+# ADD LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4nts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release" /libpath:"..\..\..\php_build\openldap\libraries\Release"

+

+!ELSEIF  "$(CFG)" == "ldap - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\openldap\include" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1 /D "COMPILE_DL_LDAP" /FR /YX /FD /GZ /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 oldap32.lib olber32.lib php4nts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\openldap\libraries\Debug"

+

+!ELSEIF  "$(CFG)" == "ldap - Win32 Debug_TS"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "ldap___Win32_Debug_TS"

+# PROP BASE Intermediate_Dir "ldap___Win32_Debug_TS"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug_TS"

+# PROP Intermediate_Dir "Debug_TS"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\openldap\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1 /D ZEND_DEBUG=1 /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\openldap\include" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1 /D "COMPILE_DL_LDAP" /YX /FD /GZ /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 oldap32.lib olber32.lib php4nts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\openldap\libraries\Debug" /libpath:"..\..\Debug"

+# ADD LINK32 oldap32.lib olber32.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"

+

+!ELSEIF  "$(CFG)" == "ldap - Win32 Release_TS"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "ldap___Win32_Release_TS"

+# PROP BASE Intermediate_Dir "ldap___Win32_Release_TS"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release_TS"

+# PROP Intermediate_Dir "Release_TS"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\openldap\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1 /D ZEND_DEBUG=0 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\openldap\include" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LDAP_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_LDAP=1 /D "COMPILE_DL_LDAP" /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4nts.lib /nologo /dll /machine:I386 /libpath:"..\..\..\openldap\libraries\Release" /libpath:"..\..\Release"

+# ADD LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "ldap - Win32 Release"

+# Name "ldap - Win32 Debug"

+# Name "ldap - Win32 Debug_TS"

+# Name "ldap - Win32 Release_TS"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\ldap.c

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\php_ldap.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h
index 1e691f93c3..a8e03a59c1 100644
--- a/ext/ldap/php_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -34,12 +34,6 @@
 #ifndef _PHP_LDAP_H
 #define _PHP_LDAP_H
 
-#if COMPILE_DL
-#undef HAVE_LDAP
-#define HAVE_LDAP 1
-#endif
-
-#if HAVE_LDAP
 #include <lber.h>
 #include <ldap.h>
 
@@ -89,39 +83,29 @@ PHP_FUNCTION(ldap_mod_add);
 PHP_FUNCTION(ldap_mod_replace);
 PHP_FUNCTION(ldap_mod_del);
 
-typedef struct {
+ZEND_BEGIN_MODULE_GLOBALS(ldap)
 	long default_link;
 	long num_links, max_links;
 	char *base_dn;
-	int le_result, le_result_entry, le_ber_entry;
-	int le_link;
-
-	/* I just found out that the thread safe features
-		of the netscape ldap library are only required if
-		multiple threads are accessing the same LDAP
-		structure.  Since we are not doing that, we do
-		not need to use this feature.  I am leaving the
-		code here anyway just in case.  smc
-		*/
-#if 0
-	struct ldap_thread_fns tfns;
-	int le_errno; /* Corresponds to the LDAP error code */
-	char *le_matched; /* Matching components of the DN, 
-                  if an NO_SUCH_OBJECT error occurred */
-	char *le_errmsg; /* Error message */
-#endif
-} ldap_module;
-
-#ifndef THREAD_SAFE
-extern ldap_module php_ldap_module;
-#endif
-
+ZEND_END_MODULE_GLOBALS(ldap)
+
+#ifdef ZTS
+# define LDAPLS_D	zend_ldap_globals *ldap_globals
+# define LDAPLS_DC	, LDAPLS_D
+# define LDAPLS_C	ldap_globals
+# define LDAPLS_CC , LDAPLS_C
+# define LDAPG(v) (ldap_globals->v)
+# define LDAPLS_FETCH()	zend_ldap_globals *ldap_globals = ts_resource(ldap_globals_id)
 #else
-
-#define ldap_module_ptr NULL
-
+# define LDAPLS_D
+# define LDAPLS_DC
+# define LDAPLS_C
+# define LDAPLS_CC
+# define LDAPG(v) (ldap_globals.v)
+# define LDAPLS_FETCH()
 #endif
 
+
 #define phpext_ldap_ptr ldap_module_ptr
 
 #endif /* _PHP_LDAP_H */
diff --git a/ext/mysql/mysql.dsp b/ext/mysql/mysql.dsp
index 20f69629f4..0d3ea0114e 100644
--- a/ext/mysql/mysql.dsp
+++ b/ext/mysql/mysql.dsp
@@ -21,7 +21,6 @@ CFG=mysql - Win32 Debug_TS
 !MESSAGE "mysql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "mysql - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "mysql - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "mysql - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

@@ -136,33 +135,6 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:"Release_TS/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS"

 

-!ELSEIF  "$(CFG)" == "mysql - Win32 Release_TS_inline"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "mysql___Win32_Release_TS_inline"

-# PROP BASE Intermediate_Dir "mysql___Win32_Release_TS_inline"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release_TS_inline"

-# PROP Intermediate_Dir "Release_TS_inline"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "ZTS" /D "MYSQL_EXPORTS" /D "COMPILE_DL_MYSQL" /D HAVE_MYSQL=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "ZTS" /D "MYSQL_EXPORTS" /D "COMPILE_DL_MYSQL" /D HAVE_MYSQL=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x40d /d "NDEBUG"

-# ADD RSC /l 0x40d /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:"Release_TS/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS"

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:"Release_TS_inline/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS_inline"

-

 !ENDIF 

 

 # Begin Target

@@ -171,7 +143,6 @@ LINK32=link.exe
 # Name "mysql - Win32 Debug"

 # Name "mysql - Win32 Debug_TS"

 # Name "mysql - Win32 Release_TS"

-# Name "mysql - Win32 Release_TS_inline"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index a6844a7c3c..471db3f26f 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -52,7 +52,6 @@ static int le_result,le_link,le_plink;
 
 #include "php_ini.h"
 
-#if HAVE_MYSQL
 # if HAVE_MYSQL_MYSQL_H
 #  include <mysql/mysql.h>
 # else
@@ -62,7 +61,6 @@ static int le_result,le_link,le_plink;
 #ifdef HAVE_ERRMSG_H
 #include <errmsg.h>
 #endif
-#endif
 
 #define SAFE_STRING(s) ((s)?(s):"")
 
@@ -150,26 +148,23 @@ zend_module_entry mysql_module_entry = {
 			 PHP_MINFO(mysql), STANDARD_MODULE_PROPERTIES
 };
 
-#ifdef ZTS
-int mysql_globals_id;
-#else
-PHP_MYSQL_API php_mysql_globals mysql_globals;
-#endif
+
+ZEND_DECLARE_MODULE_GLOBALS(mysql)
 
 #ifdef COMPILE_DL_MYSQL
-# include "dl/phpdl.h"
-DLEXPORT zend_module_entry *get_module(void) { return &mysql_module_entry; }
+ZEND_DLEXPORT zend_module_entry *get_module(void) { return &mysql_module_entry; }
 #endif
 
 void timeout(int sig);
 
 #define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING,"MySQL:  A link to the server could not be established"); RETURN_FALSE; } }
 
-/* NOTE  Don't ask me why, but soon as I made this the list
- * destructor, I stoped getting access violations in windows
- * with mysql 3.22.7a
+/*
+ * This wrapper is required since mysql_free_result() returns an integer, and
+ * thus, cannot be used directly
  */
-static void _free_mysql_result(MYSQL_RES *mysql_result){
+static void _free_mysql_result(MYSQL_RES *mysql_result)
+{
 	mysql_free_result(mysql_result);
 }
 
@@ -240,31 +235,25 @@ static PHP_INI_MH(OnMySQLPort)
 
 
 PHP_INI_BEGIN()
-	STD_PHP_INI_BOOLEAN("mysql.allow_persistent",	"1",	PHP_INI_SYSTEM,		OnUpdateInt,		allow_persistent,	php_mysql_globals,		mysql_globals)
-	STD_PHP_INI_ENTRY_EX("mysql.max_persistent",	"-1",	PHP_INI_SYSTEM,		OnUpdateInt,		max_persistent,		php_mysql_globals,		mysql_globals,	display_link_numbers)
-	STD_PHP_INI_ENTRY_EX("mysql.max_links",		"-1",	PHP_INI_SYSTEM,			OnUpdateInt,		max_links,			php_mysql_globals,		mysql_globals,	display_link_numbers)
-	STD_PHP_INI_ENTRY("mysql.default_host",		NULL,	PHP_INI_ALL,			OnUpdateString,		default_host,		php_mysql_globals,		mysql_globals)
-	STD_PHP_INI_ENTRY("mysql.default_user",		NULL,	PHP_INI_ALL,			OnUpdateString,		default_user,		php_mysql_globals,		mysql_globals)
-	STD_PHP_INI_ENTRY("mysql.default_password",	NULL,	PHP_INI_ALL,			OnUpdateString,		default_password,	php_mysql_globals,		mysql_globals)
+	STD_PHP_INI_BOOLEAN("mysql.allow_persistent",	"1",	PHP_INI_SYSTEM,		OnUpdateInt,		allow_persistent,	zend_mysql_globals,		mysql_globals)
+	STD_PHP_INI_ENTRY_EX("mysql.max_persistent",	"-1",	PHP_INI_SYSTEM,		OnUpdateInt,		max_persistent,		zend_mysql_globals,		mysql_globals,	display_link_numbers)
+	STD_PHP_INI_ENTRY_EX("mysql.max_links",		"-1",	PHP_INI_SYSTEM,			OnUpdateInt,		max_links,			zend_mysql_globals,		mysql_globals,	display_link_numbers)
+	STD_PHP_INI_ENTRY("mysql.default_host",		NULL,	PHP_INI_ALL,			OnUpdateString,		default_host,		zend_mysql_globals,		mysql_globals)
+	STD_PHP_INI_ENTRY("mysql.default_user",		NULL,	PHP_INI_ALL,			OnUpdateString,		default_user,		zend_mysql_globals,		mysql_globals)
+	STD_PHP_INI_ENTRY("mysql.default_password",	NULL,	PHP_INI_ALL,			OnUpdateString,		default_password,	zend_mysql_globals,		mysql_globals)
 	PHP_INI_ENTRY("mysql.default_port",		NULL,	PHP_INI_ALL,			OnMySQLPort)
 PHP_INI_END()
 
 
-#ifdef ZTS
-static void php_mysql_init_globals(php_mysql_globals *mysql_globals)
+static void php_mysql_init_globals(zend_mysql_globals *mysql_globals)
 {
-	MySG(num_persistent) = 0;
+	mysql_globals->num_persistent = 0;
 }
-#endif
 
 
 PHP_MINIT_FUNCTION(mysql)
 {
-#ifdef ZTS
-	mysql_globals_id = ts_allocate_id(sizeof(php_mysql_globals), (ts_allocate_ctor) php_mysql_init_globals, NULL);
-#else
-	MySG(num_persistent)=0;
-#endif
+	ZEND_INIT_MODULE_GLOBALS(mysql, php_mysql_init_globals, NULL);
 
 	REGISTER_INI_ENTRIES();
 	le_result = register_list_destructors(_free_mysql_result,NULL);
diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
index 46d4568983..50c79a49bf 100644
--- a/ext/mysql/php_mysql.h
+++ b/ext/mysql/php_mysql.h
@@ -80,23 +80,22 @@ PHP_FUNCTION(mysql_field_len);
 PHP_FUNCTION(mysql_field_type);
 PHP_FUNCTION(mysql_field_flags);
 
-typedef struct {
+ZEND_BEGIN_MODULE_GLOBALS(mysql)
 	long default_link;
 	long num_links,num_persistent;
 	long max_links,max_persistent;
 	long allow_persistent;
 	long default_port;
 	char *default_host, *default_user, *default_password;
-} php_mysql_globals;
-
+ZEND_END_MODULE_GLOBALS(mysql);
 
 #ifdef ZTS
-# define MySLS_D	php_mysql_globals *mysql_globals
+# define MySLS_D	zend_mysql_globals *mysql_globals
 # define MySLS_DC	, MySLS_D
 # define MySLS_C	mysql_globals
 # define MySLS_CC , MySLS_C
 # define MySG(v) (mysql_globals->v)
-# define MySLS_FETCH()	php_mysql_globals *mysql_globals = ts_resource(mysql_globals_id)
+# define MySLS_FETCH()	zend_mysql_globals *mysql_globals = ts_resource(mysql_module_entry.globals_id)
 #else
 # define MySLS_D
 # define MySLS_DC
@@ -104,7 +103,6 @@ typedef struct {
 # define MySLS_CC
 # define MySG(v) (mysql_globals.v)
 # define MySLS_FETCH()
-extern PHP_MYSQL_API php_mysql_globals mysql_globals;
 #endif
 
 
diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw
index 64c90e9b35..a8b372560e 100644
--- a/win32/php_modules.dsw
+++ b/win32/php_modules.dsw
@@ -39,18 +39,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "mysql"=.\ext\mysql\mysql.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "pgsql"=.\ext\pgsql\pgsql.dsp - Package Owner=<4>

 

 Package=<5>