summaryrefslogtreecommitdiff
path: root/ext/bz2
diff options
context:
space:
mode:
Diffstat (limited to 'ext/bz2')
-rw-r--r--ext/bz2/bz2.c11
-rw-r--r--ext/bz2/bz2_filter.c11
-rw-r--r--ext/bz2/php_bz2.def7
-rw-r--r--ext/bz2/php_bz2.h10
-rw-r--r--ext/bz2/tests/bug72447.phpt4
5 files changed, 7 insertions, 36 deletions
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index ad47537d21..cf1029f4d0 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 7 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2018 The PHP Group |
+ | Copyright (c) The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -671,12 +671,3 @@ static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int opt)
/* }}} */
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: fdm=marker
- * vim: noet sw=4 ts=4
- */
diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c
index 0287a1159f..e7d7c3334f 100644
--- a/ext/bz2/bz2_filter.c
+++ b/ext/bz2/bz2_filter.c
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 7 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2018 The PHP Group |
+ | Copyright (c) The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -401,12 +401,3 @@ const php_stream_filter_factory php_bz2_filter_factory = {
php_bz2_filter_create
};
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/ext/bz2/php_bz2.def b/ext/bz2/php_bz2.def
deleted file mode 100644
index 831355344a..0000000000
--- a/ext/bz2/php_bz2.def
+++ /dev/null
@@ -1,7 +0,0 @@
-EXPORTS
- BZ2_bzCompressInit
- BZ2_bzCompress
- BZ2_bzCompressEnd
- BZ2_bzDecompressInit
- BZ2_bzDecompress
- BZ2_bzDecompressEnd
diff --git a/ext/bz2/php_bz2.h b/ext/bz2/php_bz2.h
index d025058b1b..9523f32e14 100644
--- a/ext/bz2/php_bz2.h
+++ b/ext/bz2/php_bz2.h
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 7 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2018 The PHP Group |
+ | Copyright (c) The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -65,11 +65,3 @@ extern const php_stream_ops php_stream_bz2io_ops;
#define PHP_BZ2_FILTER_DEFAULT_WORKFACTOR 0
#endif
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/ext/bz2/tests/bug72447.phpt b/ext/bz2/tests/bug72447.phpt
index 939a3c289b..15321042df 100644
--- a/ext/bz2/tests/bug72447.phpt
+++ b/ext/bz2/tests/bug72447.phpt
@@ -11,5 +11,9 @@ $fp = fopen('testfile', 'w');
stream_filter_append($fp, 'bzip2.compress', STREAM_FILTER_WRITE, $param);
fclose($fp);
?>
+--CLEAN--
+<?php
+unlink('testfile');
+?>
--EXPECTF--
Warning: stream_filter_append(): Invalid parameter given for number of blocks to allocate. (0) in %s%ebug72447.php on line %d