diff options
| author | Zeev Suraski <zeev@php.net> | 2000-07-11 14:29:38 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-07-11 14:29:38 +0000 |
| commit | 168ccfc133d61bc517cf5cbc9ca1992a091476d5 (patch) | |
| tree | 8c1d12aa64189fec9e3cae31a52099daa6c27ff9 | |
| parent | 1263932a0dd7065497f97dc89d13df74d75ac382 (diff) | |
| download | php-git-168ccfc133d61bc517cf5cbc9ca1992a091476d5.tar.gz | |
Disable the hash_apply() protection on hashes that persist across requests - it's unsafe
because we may be aborted at any point
@- Fixed a possible data corruption in case of a huge amount of aborted requests (Zeev)
| -rw-r--r-- | ext/exif/exif.dsp | 2 | ||||
| -rw-r--r-- | main/SAPI.c | 2 | ||||
| -rw-r--r-- | main/php_ini.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/exif/exif.dsp b/ext/exif/exif.dsp index ce1fda35db..c75b1016c7 100644 --- a/ext/exif/exif.dsp +++ b/ext/exif/exif.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_EXIF" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c
-# 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
+# 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
# 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/main/SAPI.c b/main/SAPI.c index aaceb4266c..ae89815a82 100644 --- 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 44e7347bb3..417415f594 100644 --- 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; |