diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-22 14:04:21 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-22 14:04:59 +0100 |
| commit | 9b1c02c2df5df2801e546fd5d164c724e5c5ec23 (patch) | |
| tree | 8b7a93942167270fc88aa0e858668d4774dad195 /ext/tidy | |
| parent | 40ebfd6730dbd4ce289cf8ba310f20c0df5fb650 (diff) | |
| parent | 221345a013cad854718b438c9dc869332853df63 (diff) | |
| download | php-git-9b1c02c2df5df2801e546fd5d164c724e5c5ec23.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #77594: ob_tidyhandler is never reset
Diffstat (limited to 'ext/tidy')
| -rw-r--r-- | ext/tidy/tests/bug77594.phpt | 15 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 10 |
2 files changed, 24 insertions, 1 deletions
diff --git a/ext/tidy/tests/bug77594.phpt b/ext/tidy/tests/bug77594.phpt new file mode 100644 index 0000000000..0d84a035f7 --- /dev/null +++ b/ext/tidy/tests/bug77594.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #77594 (ob_tidyhandler is never reset) +--DESCRIPTION-- +Test is useful only with --repeat 2 (or more) +--SKIPIF-- +<?php +if (!extension_loaded('tidy')) die('skip tidy extension not available'); +?> +--FILE-- +<?php +ob_start('ob_tidyhandler'); +var_dump(ob_end_clean()); +?> +--EXPECT-- +bool(true) diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 8d87bb980c..856a8a2f23 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -228,6 +228,7 @@ static int php_tidy_output_handler(void **nothing, php_output_context *output_co static PHP_MINIT_FUNCTION(tidy); static PHP_MSHUTDOWN_FUNCTION(tidy); static PHP_RINIT_FUNCTION(tidy); +static PHP_RSHUTDOWN_FUNCTION(tidy); static PHP_MINFO_FUNCTION(tidy); ZEND_DECLARE_MODULE_GLOBALS(tidy) @@ -249,7 +250,7 @@ zend_module_entry tidy_module_entry = { PHP_MINIT(tidy), PHP_MSHUTDOWN(tidy), PHP_RINIT(tidy), - NULL, + PHP_RSHUTDOWN(tidy), PHP_MINFO(tidy), PHP_TIDY_VERSION, PHP_MODULE_GLOBALS(tidy), @@ -863,6 +864,13 @@ static PHP_RINIT_FUNCTION(tidy) return SUCCESS; } +static PHP_RSHUTDOWN_FUNCTION(tidy) +{ + TG(clean_output) = INI_ORIG_BOOL("tidy.clean_output"); + + return SUCCESS; +} + static PHP_MSHUTDOWN_FUNCTION(tidy) { UNREGISTER_INI_ENTRIES(); |