From ae22fe4c52d57db1c6451d0525b8bcd47c28b560 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Fri, 18 Feb 2000 01:52:11 +0000 Subject: [PATCH] - Update .dsp's - Fix a possible crash bug in failed file open error message - Fix SAPI initialization issue that could lead to a crash --- ext/imap/imap.c | 5 ++++- ext/imap/imap.dsp | 28 ++++------------------------ ext/mysql/php_mysql.h | 3 --- ext/pgsql/pgsql.dsp | 4 ++-- main/SAPI.c | 2 ++ 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/ext/imap/imap.c b/ext/imap/imap.c index dd34652c48..ac60283d93 100644 --- a/ext/imap/imap.c +++ b/ext/imap/imap.c @@ -838,7 +838,7 @@ void imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ PHP_FUNCTION(imap_utf7_decode) case ST_DECODE0: state++; case ST_NORMAL: + ; } } } @@ -2639,6 +2640,7 @@ PHP_FUNCTION(imap_utf7_decode) *outp++ |= UNB64(*inp); state = ST_DECODE0; case ST_NORMAL: + ; } } } @@ -2765,6 +2767,7 @@ PHP_FUNCTION(imap_utf7_encode) *outp++ = B64(*inp++); state = ST_ENCODE0; case ST_NORMAL: + ; } } } diff --git a/ext/imap/imap.dsp b/ext/imap/imap.dsp index 8970fbfd0d..e7c3a8ba0e 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 "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 @@ 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 "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 @@ 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 "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 @@ LINK32=link.exe # 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 @@ LINK32=link.exe # 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" diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h index aff9a145ae..614038efba 100644 --- a/ext/mysql/php_mysql.h +++ b/ext/mysql/php_mysql.h @@ -34,9 +34,6 @@ #endif #if HAVE_MYSQL -#ifndef DLEXPORT -#define DLEXPORT -#endif #ifdef __ZTS #include "TSRM.h" diff --git a/ext/pgsql/pgsql.dsp b/ext/pgsql/pgsql.dsp index 451b9bf286..cec34dbb8c 100644 --- a/ext/pgsql/pgsql.dsp +++ b/ext/pgsql/pgsql.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # 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 @@ LINK32=link.exe # 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" diff --git a/main/SAPI.c b/main/SAPI.c index fe03ab711e..69fa1a8a84 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -202,6 +202,8 @@ SAPI_API void sapi_activate(SLS_D) 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) { -- 2.40.0