archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source
This commit is contained in:
David Carlier 2025-06-04 20:35:17 +01:00
commit ecc9393b36
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
3 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -60,6 +60,7 @@ PHP NEWS
- Tidy: - Tidy:
. Fix memory leak in tidy output handler on error. (nielsdos) . Fix memory leak in tidy output handler on error. (nielsdos)
. Fix tidyOptIsReadonly deprecation, using tidyOptGetCategory. (David Carlier)
06 Jun 2025, PHP 8.4.8 06 Jun 2025, PHP 8.4.8

6
ext/tidy/config.m4
View file

@ -57,6 +57,12 @@ if test "$PHP_TIDY" != "no"; then
[], [],
[-L$TIDY_LIBDIR]) [-L$TIDY_LIBDIR])
PHP_CHECK_LIBRARY([$TIDY_LIB_NAME], [tidyOptGetCategory],
[AC_DEFINE([HAVE_TIDYOPTGETCATEGORY], [1],
[Define to 1 if Tidy library has the 'tidyOptGetCategory' function.])],
[],
[-L$TIDY_LIBDIR])
PHP_ADD_LIBRARY_WITH_PATH([$TIDY_LIB_NAME], PHP_ADD_LIBRARY_WITH_PATH([$TIDY_LIB_NAME],
[$TIDY_LIBDIR], [$TIDY_LIBDIR],
[TIDY_SHARED_LIBADD]) [TIDY_SHARED_LIBADD])

4
ext/tidy/tidy.c
View file

@ -234,7 +234,11 @@ static int _php_tidy_set_tidy_opt(TidyDoc doc, const char *optname, zval *value)
return FAILURE; return FAILURE;
} }
#if defined(HAVE_TIDYOPTGETCATEGORY)
if (tidyOptGetCategory(opt) == TidyInternalCategory) {
#else
if (tidyOptIsReadOnly(opt)) { if (tidyOptIsReadOnly(opt)) {
#endif
php_error_docref(NULL, E_WARNING, "Attempting to set read-only option \"%s\"", optname); php_error_docref(NULL, E_WARNING, "Attempting to set read-only option \"%s\"", optname);
return FAILURE; return FAILURE;
} }