Merge branch 'PHP-8.5' into PHP-8.6

* PHP-8.5:
  Fix GH-24697: cli: passing PHP_HTTP_PARSER_STRICT build option doesn't work

Author: ndossche

NEWS

@@ -8,6 +8,10 @@ PHP                                                                        NEWS
   . Fixed unmapping of an unrelated range when the aligned chunk mmap fails
     (Marti2203).
 
+- CLI:
+  . Fixed bug GH-24697 (PHP_HTTP_PARSER_STRICT build option doesn't work).
+    (ndossche, devnexen)
+
 - DBA:
   . Fixed bug GH-24641 (ndbm backend never checks dbm_open() return value,
     NULL deref on first use after a failed open). (Girgias)

sapi/cli/php_http_parser.c

@@ -250,7 +250,7 @@ enum flags
 #define start_state (parser->type == PHP_HTTP_REQUEST ? s_start_req : s_start_res)
 
 
-#ifdef HTTP_PARSER_STRICT
+#if HTTP_PARSER_STRICT
 # define STRICT_CHECK(cond) if (cond) goto error
 # define NEW_MESSAGE() (http_should_keep_alive(parser) ? start_state : s_dead)
 #else

sapi/cli/php_http_parser.h

@@ -36,12 +36,10 @@ extern "C" {
 
 #include <stdint.h>
 
-/* Compile with -DPHP_HTTP_PARSER_STRICT=0 to make less checks, but run
- * faster
+/* Compile with -DPHP_HTTP_PARSER_STRICT=1 to enable more checks, but run
+ * slower
  */
 #ifndef PHP_HTTP_PARSER_STRICT
-# define PHP_HTTP_PARSER_STRICT 1
-#else
 # define PHP_HTTP_PARSER_STRICT 0
 #endif