cvs: /php4 NEWS php_modules.dsw /php4/ext/imap php_imap.c /php4/ext/zlib zlib.dsp
| From: | Zeev Suraski | Date: | Thu, 20 Apr 2000 17:48:53 +0000 |
| Subject: | cvs: /php4 NEWS php_modules.dsw /php4/ext/imap php_imap.c /php4/ext/zlib zlib.dsp | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-13820@lists.php.net to get a copy of this message | ||
zeev Thu Apr 20 10:48:53 2000 EDT
Modified files:
/php4 NEWS php_modules.dsw
/php4/ext/imap php_imap.c
/php4/ext/zlib zlib.dsp
Log:
- Add the zlib project to the php_modules workspace, and fix it's C-runtime definitions
- Move IMAP to the high performance API
Index: php4/NEWS
diff -u php4/NEWS:1.209 php4/NEWS:1.210
--- php4/NEWS:1.209 Wed Apr 19 18:09:12 2000
+++ php4/NEWS Thu Apr 20 10:48:22 2000
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 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
Index: php4/php_modules.dsw
diff -u php4/php_modules.dsw:1.7 php4/php_modules.dsw:1.8
--- php4/php_modules.dsw:1.7 Sat Apr 15 12:42:27 2000
+++ php4/php_modules.dsw Thu Apr 20 10:48:22 2000
@@ -63,6 +63,18 @@
###############################################################################
+Project: "zlib"=.\ext\zlib\zlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Global:
Package=<5>
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.15 php4/ext/imap/php_imap.c:1.16
--- php4/ext/imap/php_imap.c:1.15 Thu Apr 20 07:52:54 2000
+++ php4/ext/imap/php_imap.c Thu Apr 20 10:48:22 2000
@@ -23,10 +23,11 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.15 2000/04/20 14:52:54 zeev Exp $ */
+/* $Id: php_imap.c,v 1.16 2000/04/20 17:48:22 zeev Exp $ */
#define IMAP41
+#define OP_RELOGIN
#include "php.h"
#include "php_ini.h"
@@ -190,8 +191,7 @@
* 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 @@
* 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 @@
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 @@
/* Open a new connection. */
imap_stream = mail_open(
NIL,
- mailbox->value.str.val,
+ ZSTRVAL_PP(mailbox),
flags | OP_RELOGIN);
}
Index: php4/ext/zlib/zlib.dsp
diff -u php4/ext/zlib/zlib.dsp:1.2 php4/ext/zlib/zlib.dsp:1.3
--- php4/ext/zlib/zlib.dsp:1.2 Thu Apr 20 10:41:18 2000
+++ php4/ext/zlib/zlib.dsp Thu Apr 20 10:48:22 2000
@@ -44,7 +44,7 @@
# 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 @@
# 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"