diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/imap/php_imap.c | 10 | ||||
| -rw-r--r-- | ext/zlib/zlib.dsp | 4 | ||||
| -rw-r--r-- | win32/php_modules.dsw | 12 |
4 files changed, 20 insertions, 7 deletions
@@ -2,6 +2,7 @@ PHP 4.0 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2000, Version 4.0.0 Release +- Converted the IMAP module to the high performance API (Zeev) - The fgetcsv() function now handles embedded end-of-line in a quoted field (Nick Talbott) - Added user_error(), to allow explicitly generate error messages from scripts diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index d9e1e7c42e..ea12f1cc5b 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -27,6 +27,7 @@ #define IMAP41 +#define OP_RELOGIN #include "php.h" #include "php_ini.h" @@ -190,8 +191,7 @@ void mail_userlogout_it(pils *imap_le_struct) * support this behavior... yet) */ imap_le_struct->busy = 0; - mail_close_full(imap_le_struct->imap_stream, - imap_le_struct->flags | CL_HALF); + mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags | CL_HALF); } void mail_nuke_chain(pils **headp) @@ -631,7 +631,7 @@ void imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) * out the server's hostname. */ if (persistent - && !mail_valid_net_parse(mailbox->value.str.val, &netmbx)) { + && !mail_valid_net_parse(ZSTRVAL_PP(mailbox), &netmbx)) { persistent = 0; } @@ -672,7 +672,7 @@ void imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (node) { imap_stream = mail_open( node->imap_stream, - mailbox->value.str.val, + ZSTRVAL_PP(mailbox), flags | OP_RELOGIN); if (imap_stream) { /* Ping the stream to see if it is @@ -690,7 +690,7 @@ void imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* Open a new connection. */ imap_stream = mail_open( NIL, - mailbox->value.str.val, + ZSTRVAL_PP(mailbox), flags | OP_RELOGIN); } diff --git a/ext/zlib/zlib.dsp b/ext/zlib/zlib.dsp index 645328f34a..65fc4cd951 100644 --- a/ext/zlib/zlib.dsp +++ b/ext/zlib/zlib.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL" /D ZTS=1 /D ZEND_WIN32=1 /D PHP_WIN32=1 /D ZEND_DEBUG=0 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL" /D ZTS=1 /D ZEND_WIN32=1 /D PHP_WIN32=1 /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 0x406 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL70=1 /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL" /D ZTS=1 /D ZEND_WIN32=1 /D PHP_WIN32=1 /D ZEND_DEBUG=1 /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL" /D ZTS=1 /D ZEND_WIN32=1 /D PHP_WIN32=1 /D ZEND_DEBUG=1 /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x406 /d "NDEBUG"
diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw index 6b6b583623..61cf439880 100644 --- a/win32/php_modules.dsw +++ b/win32/php_modules.dsw @@ -63,6 +63,18 @@ Package=<4> ###############################################################################
+Project: "zlib"=.\ext\zlib\zlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Global:
Package=<5>
|