Re: [PHP4BETA] cvs: php4 / main.c

On Sun, May 28, 2000 at 08:09:20PM +0300, Andi Gutmans wrote: > Actually, zend_activate_modules() should be moved after the phpinfo() and > friends functionality. The only reason why I moved them back was because > it was right before the 4.0.0 release and I didn't want to break anything. > I don't think those functions need zend_activate_modules() to be called > unless their info() functions use information which is per-request. It > really needs to be checked. hmm, but there's no need to optimize the speed of phpinfo() - right? why not move the zend_activate_modules()/zend_deactivate_modules() outside around php_execute_script()? tc > > Andi > > On Sun, 28 May 2000, Thies C. Arntzen wrote: > > > thies Sun May 28 05:30:06 2000 EDT > > > > Modified files: > > /php4 main.c > > Log: > > (php_execute_script) fix leak for phpinfo() images. > > # maybe the activate/deactivate should be moved outside php_execute_script()? > > > > > > Index: php4/main.c > > diff -u php4/main.c:1.252 php4/main.c:1.253 > > --- php4/main.c:1.252 Tue May 23 03:36:18 2000 > > +++ php4/main.c Sun May 28 05:30:06 2000 > > @@ -19,7 +19,7 @@ > > */ > > > > > > -/* $Id: main.c,v 1.252 2000/05/23 10:36:18 thies Exp $ */ > > +/* $Id: main.c,v 1.253 2000/05/28 12:30:06 thies Exp $ */ > > > > > > #include <stdio.h> > > @@ -1156,17 +1156,21 @@ > > if (!strcmp(SG(request_info).query_string+1, PHP_LOGO_GUID)) { > > sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1); > > PHPWRITE(php_logo, sizeof(php_logo)); > > + zend_deactivate_modules(); > > return; > > } else if (!strcmp(SG(request_info).query_string+1, PHP_EGG_LOGO_GUID)) { > > sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1); > > PHPWRITE(php_egg_logo, sizeof(php_egg_logo)); > > + zend_deactivate_modules(); > > return; > > } else if (!strcmp(SG(request_info).query_string+1, ZEND_LOGO_GUID)) { > > sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1); > > PHPWRITE(zend_logo, sizeof(zend_logo)); > > + zend_deactivate_modules(); > > return; > > } else if (!strcmp(SG(request_info).query_string+1, > > "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000")) { > > php_print_credits(PHP_CREDITS_ALL); > > + zend_deactivate_modules(); > > return; > > } > > } > > > > > > > > > > > -- > PHP 4.0 Beta Mailing List <http://www.php.net/version4/> > To unsubscribe, e-mail: php4beta-unsubscribe@lists.php.net > For additional commands, e-mail: php4beta-help@lists.php.net > To contact the list administrators, e-mail: php4beta-admin@lists.php.net -- Thies C. Arntzen "One Big-Mac, Small Fries and a Coke!" Digital Collections Phone +49 40 235350 Fax +49 40 23535180 Hammerbrookstr. 93 20097 Hamburg / Germany