com php-src: ext/tidy: add support for the new tidy-html5 library.: ext/tidy/config.m4 ext/tidy/tidy.c
| From: | Anatol Belski | Date: | Mon, 11 Jul 2016 12:05:43 +0000 |
| Subject: | com php-src: ext/tidy: add support for the new tidy-html5 library.: ext/tidy/config.m4 ext/tidy/tidy.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92928@lists.php.net to get a copy of this message | ||
Commit: a552ac5bd589035b66c899b74511b29a3d1a4718
Author: Michael Orlitzky <michael@orlitzky.com> Thu, 9 Jun 2016 23:00:02 -0400
Committer: Anatol Belski <ab@php.net> Mon, 11 Jul 2016 14:05:43 +0200
Parents: 6a9d9cf2724df4b00c63c206689b0bd60d334388
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a552ac5bd589035b66c899b74511b29a3d1a4718
Log:
ext/tidy: add support for the new tidy-html5 library.
Our existing libtidy support is based on the legacy "HTML tidy"
project. That project now has a successor called tidy-html5, where all
new features and bugfixes happen. Of particular note are the fixes for
two security vulnerabilities, CVE-2015-5522 and CVE-2015-5523.
The API is largely unchanged in the new project (which is truly the
successor of the original -- not a fork), and so it is almost a
drop-in replacement as far as PHP is concerned. However, one file has
changed in the new project: "buffio.h" has been moved to
"tidybuffio.h".
This commit detects the presence of tidybuffio.h at build time, and
then adjusts the import statement in tidy.c accordingly. The result is
a build that works against either the legacy project or the new
tidy-html5 project, although the test suite for the tidy extension now
fails. Those failures are not critical and will be fixed.
Gentoo-Bug: 561452
Gentoo-Bug: 585474
PHP-Bug: 72379
Bugs:
https://bugs.php.net/561452
https://bugs.php.net/585474
https://bugs.php.net/72379
Changed paths:
M ext/tidy/config.m4
M ext/tidy/tidy.c
Diff:
diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4
index ff27bd1..da9351e 100644
--- a/ext/tidy/config.m4
+++ b/ext/tidy/config.m4
@@ -25,6 +25,14 @@ if test "$PHP_TIDY" != "no"; then
if test -z "$TIDY_DIR"; then
AC_MSG_ERROR(Cannot find libtidy)
+ else
+ dnl Check for tidybuffio..h (as opposed to simply buffio.h)
+ dnl which indicates that we are building against tidy-html5
+ dnl and not the legacy htmltidy. The two are compatible,
+ dnl except for with regard to this header file.
+ if test -f "$TIDY_INCDIR/tidybuffio.h"; then
+ AC_DEFINE(HAVE_TIDYBUFFIO_H,1,[defined if tidybuffio.h exists])
+ fi
fi
TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 0537c57..d6461bd 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -31,7 +31,12 @@
#include "ext/standard/info.h"
#include "tidy.h"
+
+#if HAVE_TIDYBUFFIO_H
+#include "tidybuffio.h"
+#else
#include "buffio.h"
+#endif
/* compatibility with older versions of libtidy */
#ifndef TIDY_CALL