com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/tidy/config.w32
| From: | Christoph Michael Becker | Date: | Wed, 17 Oct 2018 14:37:09 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/tidy/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103495@lists.php.net to get a copy of this message | ||
Commit: e6c2ab546369c69d81a2ffa392cec9d32780be7c
Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 17 Oct 2018 16:36:25 +0200
Parents: 1151554668557ae649d96743c3ccb2a3ea5b278f 20695fb895a59ee0d3f4de85e648a162dc71744f
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e6c2ab546369c69d81a2ffa392cec9d32780be7c
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77027: tidy::getOptDoc() not available on Windows
Bugs:
https://bugs.php.net/77027
Changed paths:
MM NEWS
MM ext/tidy/config..w32
Diff:
diff --cc NEWS
index 6414007,7823584..adccc4d
--- a/NEWS
+++ b/NEWS
@@@ -1,32 -1,6 +1,35 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2018, PHP 7.2.12
+?? ??? ????, PHP 7.3.0RC4
+
+- Date:
+ . Updated timelib to 2018.01RC1 to address several bugs: (Derick)
+ . Fixed bug #75577 (DateTime::createFromFormat does not accept 'v' format
+ specifier). (Derick)
+ . Fixed bug #75642 (Wrap around behaviour for microseconds is not working).
+ (Derick)
+ . Fixed bug #77007 (fractions in
diff() are not correctly normalized).
+ (Derick)
+
+- Mbstring:
+ . Fixed bug #77025 (mb_strpos throws Unknown encoding or conversion error).
+ (Nikita)
+
++- Tidy:
++ . Fixed bug #77027 (tidy::getOptDoc() not available on Windows). (cmb)
++
+- Tokenizer:
+ . Fixed bug #76991 (Incorrect tokenization of multiple invalid flexible
+ heredoc strings). (Nikita)
+
+- XML:
+ . Fixed bug #30875 (xml_parse_into_struct() does not resolve entities). (cmb)
+ . Add support for getting SKIP_TAGSTART and SKIP_WHITE options. (cmb)
+
+11 Oct 2018, PHP 7.3.0RC3
+
+- CURL:
+ . Expose curl constants from curl 7.50 to 7.61. (Pierrick)
- Core:
. Fixed bug #76846 (Segfault in shutdown function after memory limit error).
diff --cc ext/tidy/config.w32
index 9b20441,aa4eb46..b1768ca
--- a/ext/tidy/config.w32
+++ b/ext/tidy/config.w32
@@@ -16,8 -17,7 +16,9 @@@ if (PHP_TIDY != "no")
EXTENSION("tidy", "tidy.c");
AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library');
+ AC_DEFINE('HAVE_TIDY_H', 1, "tidy include header")
+ AC_DEFINE('HAVE_TIDYOPTGETDOC', 1, "tidy_get_opt_doc function")
+ AC_DEFINE('HAVE_TIDYRELEASEDATE', 1, "tidy release date function")
ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
if (!PHP_TIDY_SHARED) {
ADD_DEF_FILE("ext\\tidy\\php_tidy.def");