Send Content-Length if we're sending just one chunk

diff --git a/ext/zlib/CREDITS b/ext/zlib/CREDITS
index 49728383395c3097c6e95e720e1404906e2a78af..c0a47dd2932d1d0f851eee0f0ee1fc868d8e94a3 100644 (file)
--- a/ext/zlib/CREDITS
+++ b/ext/zlib/CREDITS
@@ -1,2 +1,2 @@
 Zlib
-Rasmus Lerdorf, Stefan Roehrich
+Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 72a4680fe82cc16bf4209dfacb60b3d7e8c9e064..b331bad23ac03e783280758eaf2815f09c4efc3f 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -14,6 +14,8 @@
    +----------------------------------------------------------------------+
    | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
    |          Stefan Röhrich <sr@linux.de>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   |          Jade Nicoletti <nicoletti@nns.ch>                           |
    +----------------------------------------------------------------------+
  */
 /* $Id$ */
@@ -1200,13 +1202,11 @@ PHP_FUNCTION(ob_gzhandler)
 
                if (return_original) {
                        zval_dtor(return_value);
-#if 0
-               } else {
+               } else if (do_start && do_end) {
                        char lenbuf[64];
                        
                        sprintf(lenbuf,"Content-Length: %d",Z_STRLEN_P(return_value));
                        sapi_add_header(lenbuf,strlen(lenbuf), 1);
-#endif
                }
        } else {
                return_original = 1;