diff options
| author | Zeev Suraski <zeev@php.net> | 2001-01-03 22:45:11 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-01-03 22:45:11 +0000 |
| commit | 43a7643453bf9ef0b32f4505781a45b7b393bf71 (patch) | |
| tree | 41b275dce398b93670d805327717f91918e89f28 /sapi/apache/mod_php4.c | |
| parent | b83ee202c4bb3aa89ed54b4195daa02dd9d435b1 (diff) | |
| download | php-git-43a7643453bf9ef0b32f4505781a45b7b393bf71.tar.gz | |
Fix last couple of problematic execution paths that could corrupt the INI values
Diffstat (limited to 'sapi/apache/mod_php4.c')
| -rw-r--r-- | sapi/apache/mod_php4.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 7d9fc511a7..eef777848a 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -475,13 +475,20 @@ int send_php(request_rec *r, int display_source_mode, char *filename) /* Apache 1.2 has a more complex mechanism for reading POST data */ #if MODULE_MAGIC_NUMBER > 19961007 - if ((retval = setup_client_block(r, REQUEST_CHUNKED_ERROR))) + if ((retval = setup_client_block(r, REQUEST_CHUNKED_ERROR))) { + if (setjmp(EG(bailout))==0) { + zend_ini_deactivate(ELS_C); + } return retval; + } #endif if (AP(last_modified)) { #if MODULE_MAGIC_NUMBER < 19970912 if ((retval = set_last_modified(r, r->finfo.st_mtime))) { + if (setjmp(EG(bailout))==0) { + zend_ini_deactivate(ELS_C); + } return retval; } #else |