com php-src: folders: ext/zlib/zlib.c
| From: | Xinchen Hui | Date: | Tue, 24 Jul 2012 05:37:44 +0000 |
| Subject: | com php-src: folders: ext/zlib/zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69672@lists.php.net to get a copy of this message | ||
Commit: c20b2ab0bd8eae770088fca9dff50da76c2117e4
Author: Xinchen Hui <laruence@php.net> Tue, 24 Jul 2012 13:37:44 +0800
Parents: a88eca53f708602384cae147a8376352d5909d90
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c20b2ab0bd8eae770088fca9dff50da76c2117e4
Log:
folders
Changed paths:
M ext/zlib/zlib.c
Diff:
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 9cd1f37..eac757b 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -690,6 +690,7 @@ PHP_ZLIB_ENCODE_FUNC(zlib_encode, 0);
/* {{{ proto binary zlib_decode(binary data[, int max_decoded_len])
Uncompress any raw/gzip/zlib encoded data */
PHP_ZLIB_DECODE_FUNC(zlib_decode, PHP_ZLIB_ENCODING_ANY);
+/* }}} */
/* NOTE: The naming of these userland functions was quite unlucky */
/* {{{ proto binary gzdeflate(binary data[, int level = -1[, int encoding = ZLIB_ENCODING_RAW])
@@ -701,18 +702,22 @@ PHP_ZLIB_ENCODE_FUNC(gzdeflate, PHP_ZLIB_ENCODING_RAW);
Encode data with the gzip encoding */
PHP_ZLIB_ENCODE_FUNC(gzencode, PHP_ZLIB_ENCODING_GZIP);
/* }}} */
+
/* {{{ proto binary gzcompress(binary data[, int level = -1[, int encoding =
ZLIB_ENCODING_DEFLATE])
Encode data with the zlib encoding */
PHP_ZLIB_ENCODE_FUNC(gzcompress, PHP_ZLIB_ENCODING_DEFLATE);
/* }}} */
+
/* {{{ proto binary gzinflate(binary data[, int max_decoded_len])
Decode raw deflate encoded data */
PHP_ZLIB_DECODE_FUNC(gzinflate, PHP_ZLIB_ENCODING_RAW);
/* }}} */
+
/* {{{ proto binary gzdecode(binary data[, int max_decoded_len])
Decode gzip encoded data */
PHP_ZLIB_DECODE_FUNC(gzdecode, PHP_ZLIB_ENCODING_GZIP);
/* }}} */
+
/* {{{ proto binary gzuncompress(binary data[, int max_decoded_len])
Decode zlib encoded data */
PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE);
@@ -967,12 +972,14 @@ static PHP_RINIT_FUNCTION(zlib)
}
/* }}} */
+/* {{{ PHP_RSHUTDOWN_FUNCTION */
static PHP_RSHUTDOWN_FUNCTION(zlib)
{
php_zlib_cleanup_ob_gzhandler_mess(TSRMLS_C);
return SUCCESS;
}
+/* }}} */
/* {{{ PHP_MINFO_FUNCTION */
static PHP_MINFO_FUNCTION(zlib)