Skip to content

Commit

Permalink
Fix #77027: tidy::getOptDoc() not available on Windows
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
cmb69 committed Oct 17, 2018
1 parent b331242 commit 8a9e031
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions ext/tidy/config.w32
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 8a9e031

Please sign in to comment.