Skip to content

Commit 5d505ea

Browse files
authored
Fix PHP syntax error in override.ini
1 parent 84d261a commit 5d505ea

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
# Make OpenSSL trust us
1+
; Make OpenSSL trust us
22
openssl.cafile=${SSL_CERT_FILE}
3-
# Make cURL trust us
3+
; Make cURL trust us
44
curl.cainfo=${SSL_CERT_FILE}
5-
# Prepend a script that enables the proxy
5+
; Prepend a script that enables the proxy
66
auto_prepend_file=${HTTP_TOOLKIT_OVERRIDE_PATH}/php/prepend.php
77

8-
# Intercepting PHP using this file via PHP_INI_SCAN_DIR isn't a perfect solution. It's better
9-
# to use the 'php' wrapper (overrides/path/php) which sets this configuration, because when
10-
# PHP_INI_SCAN_DIR is left blank it defaults to a system config directory, and overriding this
11-
# means that is not loaded.
12-
# Unfortunately, it's not always possible to inject the 'php' wrapper where we need it, due to
13-
# how PHP is often launched (managed by another process, not launched & injectable by HTTP Toolkit).
14-
# This is a fallback solution for that case that seems to work well in practice.
8+
; Intercepting PHP using this file via PHP_INI_SCAN_DIR isn't a perfect solution. It's better
9+
; to use the 'php' wrapper (overrides/path/php) which sets this configuration, because when
10+
; PHP_INI_SCAN_DIR is left blank it defaults to a system config directory, and overriding this
11+
; means that is not loaded.
12+
; Unfortunately, it's not always possible to inject the 'php' wrapper where we need it, due to
13+
; how PHP is often launched (managed by another process, not launched & injectable by HTTP Toolkit).
14+
; This is a fallback solution for that case that seems to work well in practice.
1515

16-
# Where this doesn't work, you may be able to replace the relevant env vars above and place this
17-
# file directly into your PHP_INI_SCAN_DIR directory (run php --ini to find this).
16+
; Where this doesn't work, you may be able to replace the relevant env vars above and place this
17+
; file directly into your PHP_INI_SCAN_DIR directory (run php --ini to find this).
1818

19-
# (In future, we could consider more complicated fixes: e.g. a prepend script that launches a PHP
20-
# subprocess which runs with the default configuration, just explicitly overridden by CLI args.
21-
# That would have some performance implications, but probably nothing notable in dev. Not worthwhile
22-
# for now unless this causes serious problems though)
19+
; (In future, we could consider more complicated fixes: e.g. a prepend script that launches a PHP
20+
; subprocess which runs with the default configuration, just explicitly overridden by CLI args.
21+
; That would have some performance implications, but probably nothing notable in dev. Not worthwhile
22+
; for now unless this causes serious problems though)

0 commit comments

Comments
 (0)