Re: cvs: php4 /main output.c

This affects some of the newly introduced tests and the ob discussion... Derick could you verify that your test uses the correct ini file when running: sapi/cli/php -c php.ini-dist run-tests.php tests/strings/004.phpt Remember the handling and test for ini detection is currently NOT correct. As far as i can see it seems like you used an old version from the ini since the test you wrote expects some "#0000BB" coulor but in the current ini highlight.string = #CC0000 highlight.comment = #FF9900 highlight.keyword = #006600

highlight.bg      = #FFFFFF

highlight.default = #0000CC

highlight.html    = #000000

i can find no "#0000BB" At 19:11 04.10.2002, Marcus Börger wrote:

helly           Fri Oct  4 13:11:36 2002 EDT

Modified files:

    /php4/main  output.c

Log: suggest paranthesis around || and && Index: php4/main/output.c diff -u php4/main/output.c:1.138 php4/main/output.c:1.139

--- php4/main/output.c:1.138    Thu Oct  3 09:32:01 2002

+++ php4/main/output.c Fri Oct 4 13:11:35 2002 @@ -18,7 +18,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: output.c,v 1.138 2002/10/03 13:32:01 yohgaki Exp $ */ +/* $Id: output.c,v 1.139 2002/10/04 17:11:35 helly Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -591,9 +591,9 @@

        memcpy(target, text, text_length);
        target[text_length]=0;

-       /* If implicit_flush is On, send contents to next buffer and return. */
-       if (OG(implicit_flush) || OG(active_ob_buffer).chunk_size
-               && OG(active_ob_buffer).text_length >= OG(active_ob_buffer).chunk_size)
+       /* If implicit_flush is On or chunked buffering, send contents to next buffer and return. */
+       if (OG(implicit_flush) || (OG(active_ob_buffer).chunk_size
+               && OG(active_ob_buffer).text_length >= OG(active_ob_buffer).chunk_size))
        {
                zval *output_handler = OG(active_ob_buffer).output_handler;

-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php