From 4a26ff401e9ea2412add1eb65996fd23c420d234 Mon Sep 17 00:00:00 2001 From: Jim Winstead Date: Fri, 27 Dec 2024 12:39:52 -0800 Subject: [PATCH 1/3] Clarify type of a few INI values --- appendices/ini.core.xml | 10 +++++----- reference/mysqli/ini.xml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appendices/ini.core.xml b/appendices/ini.core.xml index 1be2942eb231..7943265cfff8 100644 --- a/appendices/ini.core.xml +++ b/appendices/ini.core.xml @@ -1499,14 +1499,14 @@ include_path = ".:${USER}/pear/php" cgi.rfc2616_headers - int + bool Tells PHP what type of headers to use when sending HTTP response - code. If it's set to 0, PHP sends a RFC 3875 + code. If it is disabled, PHP sends a RFC 3875 "Status:" header that is supported by Apache and other web servers. When this option - is set to 1, PHP will send RFC 2616 compliant + is enabled, PHP will send RFC 2616 compliant headers. @@ -1516,7 +1516,7 @@ include_path = ".:${USER}/pear/php" you should use header("Status: 404 Not Found"); - Leave it set to 0 unless you know what you're doing. + Leave it disabled unless you know what you're doing. @@ -1524,7 +1524,7 @@ include_path = ".:${USER}/pear/php" fastcgi.impersonate - string + bool diff --git a/reference/mysqli/ini.xml b/reference/mysqli/ini.xml index e9fe80224d8c..bb1c8faf1958 100644 --- a/reference/mysqli/ini.xml +++ b/reference/mysqli/ini.xml @@ -106,7 +106,7 @@ mysqli.allow_local_infile - int + bool @@ -132,7 +132,7 @@ mysqli.allow_persistent - int + bool From 2d7597e90dd906f74bb91314ea007a0465ac7428 Mon Sep 17 00:00:00 2001 From: Jim Winstead Date: Fri, 27 Dec 2024 12:45:04 -0800 Subject: [PATCH 2/3] Fix explanation of values --- appendices/ini.core.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appendices/ini.core.xml b/appendices/ini.core.xml index 7943265cfff8..2adc5a73e50c 100644 --- a/appendices/ini.core.xml +++ b/appendices/ini.core.xml @@ -1532,7 +1532,7 @@ include_path = ".:${USER}/pear/php" security tokens of the calling client. This allows IIS to define the security context that the request runs under. mod_fastcgi under Apache does not currently support this feature (03/17/2002) - Set to 1 if running under IIS. Default is zero. + Enable if running under IIS. Default is disabled. From 8c36a59e748d3b47df356d330b84d28f5907764d Mon Sep 17 00:00:00 2001 From: Jim Winstead Date: Fri, 27 Dec 2024 13:03:57 -0800 Subject: [PATCH 3/3] Fix a bunch of trailing whitespace --- appendices/ini.core.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/appendices/ini.core.xml b/appendices/ini.core.xml index 2adc5a73e50c..1fe0c37978cf 100644 --- a/appendices/ini.core.xml +++ b/appendices/ini.core.xml @@ -1495,7 +1495,7 @@ include_path = ".:${USER}/pear/php" - + cgi.rfc2616_headers @@ -1504,15 +1504,15 @@ include_path = ".:${USER}/pear/php" Tells PHP what type of headers to use when sending HTTP response - code. If it is disabled, PHP sends a RFC 3875 - "Status:" header that is supported by Apache and other web servers. When this option + code. If it is disabled, PHP sends a RFC 3875 + "Status:" header that is supported by Apache and other web servers. When this option is enabled, PHP will send RFC 2616 compliant - headers. + headers. If this option is enabled, and you are running PHP in a CGI environment (e.g. PHP-FPM) - you should not use standard RFC 2616 style HTTP status response headers, you should - instead use their RFC 3875 equivalent e.g. instead of header("HTTP/1.0 404 Not found"); + you should not use standard RFC 2616 style HTTP status response headers, you should + instead use their RFC 3875 equivalent e.g. instead of header("HTTP/1.0 404 Not found"); you should use header("Status: 404 Not Found"); @@ -1520,7 +1520,7 @@ include_path = ".:${USER}/pear/php" - + fastcgi.impersonate