cvs: /php4 SAPI.c /php4/ext/imap imap.c imap.dsp /php4/ext/mysql php_mysql.h /php4/ext/pgsql pgsql.dsp

zeev Thu Feb 17 17:52:41 2000 EDT Modified files: /php4 SAPI.c /php4/ext/imap imap.c imap.dsp /php4/ext/mysql php_mysql.h /php4/ext/pgsql pgsql.dsp Log: - Update .dsp's - Fix a possible crash bug in failed file open error message - Fix SAPI initialization issue that could lead to a crash Index: php4/SAPI.c diff -u php4/SAPI.c:1.56 php4/SAPI.c:1.57 --- php4/SAPI.c:1.56 Thu Feb 17 12:46:13 2000 +++ php4/SAPI.c Thu Feb 17 17:52:10 2000 @@ -202,6 +202,8 @@ sapi_module.sapi_error(E_COMPILE_ERROR, "No content-type in POST request"); } sapi_read_post_data(SLS_C); + } else { + SG(request_info).content_type_dup = NULL; } SG(request_info).cookie_data = sapi_module.read_cookies(SLS_C); if (sapi_module.activate) { Index: php4/ext/imap/imap.c diff -u php4/ext/imap/imap.c:1.37 php4/ext/imap/imap.c:1.38 --- php4/ext/imap/imap.c:1.37 Tue Feb 15 12:06:53 2000 +++ php4/ext/imap/imap.c Thu Feb 17 17:52:10 2000 @@ -21,7 +21,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: imap.c,v 1.37 2000/02/15 20:06:53 chagenbu Exp $ */ +/* $Id: imap.c,v 1.38 2000/02/18 01:52:10 zeev Exp $ */ #define IMAP41 @@ -838,7 +838,7 @@ Open an IMAP stream to a mailbox */ PHP_FUNCTION(imap_open) { - return imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ @@ -2583,6 +2583,7 @@ case ST_DECODE0: state++; case ST_NORMAL: + ; } } } @@ -2639,6 +2640,7 @@ *outp++ |= UNB64(*inp); state = ST_DECODE0; case ST_NORMAL: + ; } } } @@ -2765,6 +2767,7 @@ *outp++ = B64(*inp++); state = ST_ENCODE0; case ST_NORMAL: + ; } } } Index: php4/ext/imap/imap.dsp diff -u php4/ext/imap/imap.dsp:1.1 php4/ext/imap/imap.dsp:1.2 --- php4/ext/imap/imap.dsp:1.1 Sat Feb 5 11:22:17 2000 +++ php4/ext/imap/imap.dsp Thu Feb 17 17:52:10 2000 @@ -44,7 +44,7 @@ # 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 "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -69,7 +69,7 @@ # 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 "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /FR /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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -95,7 +95,7 @@ # 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 "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -120,7 +120,7 @@ # PROP Intermediate_Dir "Release_TS" # 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 "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -146,27 +146,7 @@ # Begin Source File SOURCE=.\imap.c - -!IF "$(CFG)" == "imap - Win32 Release" - # ADD CPP /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\IMAP\c-client" /I "..\..\TSRM" - -!ELSEIF "$(CFG)" == "imap - Win32 Debug" - -# ADD CPP /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\IMAP\c-client" /I "..\..\TSRM" - -!ELSEIF "$(CFG)" == "imap - Win32 Debug_TS" - -# ADD BASE CPP /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\IMAP\c-client" /I "..\..\TSRM" -# ADD CPP /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\IMAP\c-client" /I "..\..\TSRM" - -!ELSEIF "$(CFG)" == "imap - Win32 Release_TS" - -# ADD BASE CPP /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\IMAP\c-client" /I "..\..\TSRM" -# ADD CPP /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\IMAP\c-client" /I "..\..\TSRM" - -!ENDIF - # End Source File # End Group # Begin Group "Header Files" Index: php4/ext/mysql/php_mysql.h diff -u php4/ext/mysql/php_mysql.h:1.5 php4/ext/mysql/php_mysql.h:1.6 --- php4/ext/mysql/php_mysql.h:1.5 Sat Feb 12 06:38:02 2000 +++ php4/ext/mysql/php_mysql.h Thu Feb 17 17:52:11 2000 @@ -17,7 +17,7 @@ */ -/* $Id: php_mysql.h,v 1.5 2000/02/12 14:38:02 sas Exp $ */ +/* $Id: php_mysql.h,v 1.6 2000/02/18 01:52:11 zeev Exp $ */ #ifndef _PHP_MYSQL_H #define _PHP_MYSQL_H @@ -34,9 +34,6 @@ #endif #if HAVE_MYSQL -#ifndef DLEXPORT -#define DLEXPORT -#endif #ifdef __ZTS #include "TSRM.h" Index: php4/ext/pgsql/pgsql.dsp diff -u php4/ext/pgsql/pgsql.dsp:1.4 php4/ext/pgsql/pgsql.dsp:1.5 --- php4/ext/pgsql/pgsql.dsp:1.4 Sun Dec 19 13:02:50 1999 +++ php4/ext/pgsql/pgsql.dsp Thu Feb 17 17:52:11 2000 @@ -43,7 +43,7 @@ # 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 "PGSQL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /D HAVE_PGSQL=1 /D "COMPILE_DL" /D "ZTS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "PGSQL_EXPORTS" /D HAVE_PGSQL=1 /D "COMPILE_DL" /D "ZTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -69,7 +69,7 @@ # PROP Intermediate_Dir "pgsql___Win32_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 "PGSQL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /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"