stas Tue Aug 8 13:34:14 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2handler sapi_apache2.c
Log:
fix bug with variables clobbered by longjmp
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.4&r2=1.57.2.10.2.5&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.4
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.5
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.4 Wed Jul 26
10:31:08 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c Tue Aug 8 13:34:14 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.4 2006/07/26 10:31:08 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.5 2006/08/08 13:34:14 stas Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -465,12 +465,12 @@
static int php_handler(request_rec *r)
{
- php_struct *ctx;
+ php_struct * volatile ctx;
void *conf;
- apr_bucket_brigade *brigade;
+ apr_bucket_brigade * volatile brigade;
apr_bucket *bucket;
apr_status_t rv;
- request_rec *parent_req = NULL;
+ request_rec * volatile parent_req = NULL;
TSRMLS_FETCH();
#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
