cvs: php4 /sapi/apache mod_php4.c
| From: | Zeev Suraski | Date: | Wed, 03 Jan 2001 22:45:11 +0000 |
| Subject: | cvs: php4 /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3356@lists.php.net to get a copy of this message | ||
zeev Wed Jan 3 14:45:11 2001 EDT
Modified files:
/php4/sapi/apache mod_php4.c
Log:
Fix last couple of problematic execution paths that could corrupt the INI values
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.83 php4/sapi/apache/mod_php4.c:1.84
--- php4/sapi/apache/mod_php4.c:1.83 Wed Jan 3 03:56:00 2001
+++ php4/sapi/apache/mod_php4.c Wed Jan 3 14:45:11 2001
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.83 2001/01/03 11:56:00 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.84 2001/01/03 22:45:11 zeev Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -475,13 +475,20 @@
/* 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