cvs: php4 /ext/exif exif.dsp /main SAPI.c php_ini.c
| From: | Zeev Suraski | Date: | Tue, 11 Jul 2000 14:29:38 +0000 |
| Subject: | cvs: php4 /ext/exif exif.dsp /main SAPI.c php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-720@lists.php.net to get a copy of this message | ||
zeev Tue Jul 11 07:29:38 2000 EDT
Modified files:
/php4/ext/exif exif.dsp
/php4/main SAPI.c php_ini.c
Log:
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)
Index: php4/ext/exif/exif.dsp
diff -u php4/ext/exif/exif.dsp:1.5 php4/ext/exif/exif.dsp:1.6
--- php4/ext/exif/exif.dsp:1.5 Mon Jun 12 13:31:45 2000
+++ php4/ext/exif/exif.dsp Tue Jul 11 07:29:38 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_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"
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.78 php4/main/SAPI.c:1.79
--- php4/main/SAPI.c:1.78 Wed Jul 5 01:57:37 2000
+++ php4/main/SAPI.c Tue Jul 11 07:29:38 2000
@@ -75,7 +75,7 @@
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);
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.36 php4/main/php_ini.c:1.37
--- php4/main/php_ini.c:1.36 Fri Jun 2 20:05:28 2000
+++ php4/main/php_ini.c Tue Jul 11 07:29:38 2000
@@ -62,7 +62,7 @@
*/
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;