[php-src] master: Merge branch 'PHP-8.3'
| From: | Niels Dossche | Date: | Tue, 16 Apr 2024 20:18:10 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.3' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128143@lists.php.net to get a copy of this message | ||
Author: Niels Dossche (nielsdos)
Date: 2024-04-16T22:17:59+02:00
Commit: https://github.com/php/php-src/commit/14cd67a42af5cdad61c957540671f574434917ce
Raw diff: https://github.com/php/php-src/commit/14cd67a42af5cdad61c957540671f574434917ce.diff
Merge branch 'PHP-8.3'
* PHP-8.3:
Fix GH-13978: Fuzzer readme still mentions obsolete --enable-json flag (#13983)
Changed paths:
M sapi/fuzzer/README.md
Diff:
diff --git a/sapi/fuzzer/README.md b/sapi/fuzzer/README.md
index ee2d0ee4e0262..b4bb2bbe4573f 100644
--- a/sapi/fuzzer/README.md
+++ b/sapi/fuzzer/README.md
@@ -26,7 +26,7 @@ When running
make it creates these binaries in
sapi/fuzzer/:
* php-fuzz-parser: Fuzzing language parser and compiler
* php-fuzz-unserialize: Fuzzing unserialize() function
* php-fuzz-unserializehash: Fuzzing unserialize() for HashContext objects
-* php-fuzz-json: Fuzzing JSON parser (requires --enable-json)
+* php-fuzz-json: Fuzzing JSON parser
* php-fuzz-exif: Fuzzing exif_read_data() function (requires
--enable-exif)
* php-fuzz-mbstring: Fuzzing mb_convert_encoding() (requires
--enable-mbstring)
* php-fuzz-mbregex: Fuzzing mb_ereg[i]() (requires --enable-mbstring)