com php-src: Fix #77027: tidy::getOptDoc() not available on Windows: NEWS ext/tidy/config.w32
| From: | Christoph Michael Becker | Date: | Wed, 17 Oct 2018 14:27:07 +0000 |
| Subject: | com php-src: Fix #77027: tidy::getOptDoc() not available on Windows: NEWS ext/tidy/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103493@lists.php.net to get a copy of this message | ||
Commit: 8a9e0312ce90f6cdc55a8fb6f1e1af326306b97a
Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 17 Oct 2018 16:27:07 +0200
Parents: b33124239af07c9349cba42a516b9f00e8357445
Branches: PHP-7.1 PHP-7..2 PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a9e0312ce90f6cdc55a8fb6f1e1af326306b97a
Log:
Fix #77027: tidy::getOptDoc() not available on Windows
We define the
HAVE_TIDYOPTGETDOC macro unconditionally, since the
Windows PHP SDK ships libtidy 2009/04/06 or newer for a long time.
We do not add a regression test, since 021.phpt already tests
tidy_get_opt_doc, but has previously been skipped due to
unavailability of the function.
Bugs:
https://bugs.php.net/77027
Changed paths:
M NEWS
M ext/tidy/config.w32
Diff:
diff --git a/NEWS b/NEWS
index 4652c66..b1eb3c3 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,9 @@ PHP NEWS
. Fixed bug #76965 (INI_SCANNER_RAW doesn't strip trailing whitespace).
(Pierrick)
+- Tidy:
+ . Fixed bug #77027 (tidy::getOptDoc() not available on Windows). (cmb)
+
- XML:
. Fixed bug #30875 (xml_parse_into_struct() does not resolve entities). (cmb)
. Add support for getting SKIP_TAGSTART and SKIP_WHITE options. (cmb)
diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32
index 44b2abe..aa4eb46 100644
--- a/ext/tidy/config.w32
+++ b/ext/tidy/config.w32
@@ -17,6 +17,7 @@ if (PHP_TIDY != "no") {
EXTENSION("tidy", "tidy.c");
AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library');
+ AC_DEFINE('HAVE_TIDYOPTGETDOC', 1, "tidy_get_opt_doc function")
ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
if (!PHP_TIDY_SHARED) {
ADD_DEF_FILE("ext\\tidy\\php_tidy.def");