Re: cvs: php-src(PHP_5_3) /ext/standard exec.c
| From: | Pierre Joye | Date: | Mon, 20 Apr 2009 06:17:48 +0000 |
| Subject: | Re: cvs: php-src(PHP_5_3) /ext/standard exec.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-57089@lists.php.net to get a copy of this message | ||
hi Ilia,
It is not related to ZTS but to the new output API in HEAD. For the
new struct, see main/php_output.h:126).
Cheers,
On Sun, Apr 19, 2009 at 4:59 PM, Ilia Alshanetsky <iliaa@php.net> wrote:
> iliaa      Sun Apr 19 14:59:52 2009 UTC
>
> Â Modified files: Â Â Â Â Â Â Â (Branch: PHP_5_3)
>   /php-src/ext/standard    exec.c
> Â Log:
> Â Fixed bug #47937 (system() calls sapi_flush() regardless of output
> Â buffering)
>
>
> Ü¡':±Ðÿ‰°rj
> €http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.15&r2=1.113.2.3.2.1.2.16&diff_format=u
> Index: php-src/ext/standard/exec.c
> diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.15
> php-src/ext/standard/exec.c:1.113.2.3.2.1.2.16
> --- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.15 Â Â Â Wed Dec 31 11:15:45 2008
> +++ php-src/ext/standard/exec.c Sun Apr 19 14:59:52 2009
> @@ -16,7 +16,7 @@
> Â Â | Â Â Â Â Ilia Alshanetsky <iliaa@php.net> Â Â Â Â Â Â Â Â Â Â Â Â
> Â Â |
> Â Â +----------------------------------------------------------------------+
> Â */
> -/* $Id: exec.c,v 1.113.2.3.2.1.2.15 2008/12/31 11:15:45 sebastian Exp $ */
> +/* $Id: exec.c,v 1.113.2.3.2.1.2.16 2009/04/19 14:59:52 iliaa Exp $ */
>
> Â #include <stdio.h>
> Â #include "php.h"
> @@ -131,7 +131,9 @@
>
> Â Â Â Â Â Â Â Â Â Â Â Â if (type == 1) {
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â PHPWRITE(buf, bufl);
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â sapi_flush(TSRMLS_C);
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (OG(ob_nesting_level) < 1) {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â sapi_flush(TSRMLS_C);
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
> Â Â Â Â Â Â Â Â Â Â Â Â } else if (type == 2) {
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â /* strip trailing whitespaces */
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â l = bufl;
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
Pierre
http://blog.thepimp.net | http://www.libgd.org