diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2003-05-21 17:00:57 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2003-05-21 17:00:57 +0000 |
| commit | 022d058ce1b9a221087177b1336bf2b31bf01407 (patch) | |
| tree | d2aee114ad1ee783ca3d7e8f70e2b7dbb9cc5c29 | |
| parent | 5aaa0bcf64dff65ecd84653d5501cad08b56ead7 (diff) | |
| download | php-git-022d058ce1b9a221087177b1336bf2b31bf01407.tar.gz | |
Revert bogus commit
| -rw-r--r-- | ext/zlib/zlib.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index ba225d4d9e..ac59b2c90d 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -47,7 +47,6 @@ #include "safe_mode.h" #include "ext/standard/php_standard.h" #include "ext/standard/info.h" -#include "ext/standard/php_smart_str.h" #include "php_zlib.h" #include "fopen_wrappers.h" #if HAVE_PWD_H @@ -78,22 +77,6 @@ #define GZIP_HEADER_LENGTH 10 #define GZIP_FOOTER_LENGTH 8 -#define ADD_CL_HEADER(xln) \ -{ \ - smart_str str = {0}; \ - sapi_header_line ctr = {0}; \ - \ - smart_str_appends(&str, "Content-Length: "); \ - smart_str_append_long(&str, xln); \ - smart_str_0(&str); \ - \ - ctr.line = str.c; \ - ctr.line_len = str.len; \ - \ - sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC); \ - smart_str_free(&str); \ -} - /* True globals, no need for thread safety */ static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ @@ -1017,8 +1000,6 @@ PHP_FUNCTION(ob_gzhandler) if (return_original) { zval_dtor(return_value); - } else if(do_start && do_end) { - ADD_CL_HEADER(Z_STRLEN_P(return_value)); } } else { @@ -1046,8 +1027,6 @@ static void php_gzip_output_handler(char *output, uint output_len, char **handle do_end = (mode & PHP_OUTPUT_HANDLER_END ? 1 : 0); if (php_deflate_string(output, output_len, handled_output, handled_output_len, ZLIBG(ob_gzip_coding), do_start, do_end, ZLIBG(output_compression_level) TSRMLS_CC)!=SUCCESS) { zend_error(E_ERROR, "Compression failed"); - } else if (do_start && do_end) { - ADD_CL_HEADER(*handled_output_len); } } } |