cvs: php4 /sapi/apache sapi_apache.c
| From: | Zeev Suraski | Date: | Thu, 02 Nov 2000 12:05:55 +0000 |
| Subject: | cvs: php4 /sapi/apache sapi_apache.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2408@lists.php.net to get a copy of this message | ||
zeev Thu Nov 2 04:05:55 2000 EDT
Modified files:
/php4/sapi/apache sapi_apache.c
Log:
Fix a nasty bug in the shutdown sequence of PHP under Apache.
Index: php4/sapi/apache/sapi_apache.c
diff -u php4/sapi/apache/sapi_apache.c:1.21 php4/sapi/apache/sapi_apache.c:1.22
--- php4/sapi/apache/sapi_apache.c:1.21 Fri Oct 13 22:06:16 2000
+++ php4/sapi/apache/sapi_apache.c Thu Nov 2 04:05:54 2000
@@ -19,7 +19,7 @@
| Stig Bakken <ssb@fast.no> |
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache.c,v 1.21 2000/10/14 05:06:16 rasmus Exp $ */
+/* $Id: sapi_apache.c,v 1.22 2000/11/02 12:05:54 zeev Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -89,6 +89,9 @@
(void) php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
}
+ if (setjmp(EG(bailout))!=0) {
+ return OK;
+ }
php_header(); /* Make sure headers have been sent */
php_end_ob_buffers(1);
return (OK);