From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 17 Oct 2018 14:27:07 +0000 (+0200)
Subject: Fix #77027: tidy::getOptDoc() not available on Windows
X-Git-Tag: php-7.1.24RC1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a9e0312ce90f6cdc55a8fb6f1e1af326306b97a;p=php

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.
---

diff --git a/NEWS b/NEWS
index 4652c6657f..b1eb3c3be1 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 44b2abeacc..aa4eb46539 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");