Disable the hash_apply() protection on hashes that persist across requests - it's...

because we may be aborted at any point
@- Fixed a possible data corruption in case of a huge amount of aborted requests (Zeev)

diff --git a/ext/exif/exif.dsp b/ext/exif/exif.dsp
index ce1fda35db4e1655996d92270d0ce7274bdd64cf..c75b1016c764ce3604a52f07d187aa52198a8f53 100644 (file)
--- a/ext/exif/exif.dsp
+++ b/ext/exif/exif.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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_EXIF" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXIF_EXPORTS" /D "COMPILE_DL_EXIF" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_EXIF=1 /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXIF_EXPORTS" /D "COMPILE_DL_EXIF" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_EXIF=1 /FR /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r

diff --git a/main/SAPI.c b/main/SAPI.c
index aaceb4266c36367fa7e0e41ab7528125d1431c52..ae89815a82ae5b0a76c0ea09b615c33950d68bdf 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -75,7 +75,7 @@ SAPI_API void (*sapi_error)(int error_type, const char *message, ...);
 SAPI_API void sapi_startup(sapi_module_struct *sf)
 {
        sapi_module = *sf;
-       zend_hash_init(&known_post_content_types, 5, NULL, NULL, 1);
+       zend_hash_init_ex(&known_post_content_types, 5, NULL, NULL, 1, 0);
 
        sapi_register_post_entries(supported_post_entries);
 

diff --git a/main/php_ini.c b/main/php_ini.c
index 44e7347bb3bb055e3a4a368beadf34633b02175a..417415f594cb52b974ef6cb92403e2ac427009f0 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -62,7 +62,7 @@ static int php_restore_ini_entry_cb(php_ini_entry *ini_entry, int stage)
  */
 int php_ini_mstartup()
 {
-       if (zend_hash_init(&known_directives, 100, NULL, NULL, 1)==FAILURE) {
+       if (zend_hash_init_ex(&known_directives, 100, NULL, NULL, 1, 0)==FAILURE) {
                return FAILURE;
        }
        return SUCCESS;