Fix last couple of problematic execution paths that could corrupt the INI values

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 7d9fc511a77c0763a7e658ce52ecd6a26807b3ab..eef777848a4e1881b9b7d25ea89bf3ead412f579 100644 (file)
--- 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