Fix setlocale() with magic locale strings#8834
Closed
fredemmott wants to merge 1 commit intofacebook:masterfrom
Closed
Fix setlocale() with magic locale strings#8834fredemmott wants to merge 1 commit intofacebook:masterfrom
fredemmott wants to merge 1 commit intofacebook:masterfrom
Conversation
There are two write-only magic locale C strings for `setlocale`
- `""`, which means "set the locale based on the environment"
- nullptr (represented in PHP as the string `"0"`), which means
"return the current locale"
On a fresh request, `setlocale(LC_ALL, "0")` previously returned `""`,
but
- the initial locale is `"C"`, not inherited from the environment (this matches
C and Python, but PHP inherits from the environment by default)
- `""` should never be *returned* as a locale
Additionally, setting to `""` did set the locale to be inherited from the
environment, but calling `setlocale(LC_ALL, "")` would return the empty string
(indistinguishable from the initial state) rather than the locale.
This diff does not change the default locale or how setting works, but it does
correct the *indicated* locale, which was previously incorrect in these cases.
Future work will probably include
- adding a read-only getlocale()
- adding a read-only environmentlocale() or similar to make it possible to fetch
it without changing the state
- add newlocale to allow using a specific locale without creating it
Test Plan:
```
$ locale
LANG=
LANGUAGE=
LC_CTYPE="en_GB.UTF-8"
LC_NUMERIC="en_GB.UTF-8"
LC_TIME="en_GB.UTF-8"
LC_COLLATE="en_GB.UTF-8"
LC_MONETARY="en_GB.UTF-8"
LC_MESSAGES="en_GB.UTF-8"
LC_PAPER="en_GB.UTF-8"
LC_NAME="en_GB.UTF-8"
LC_ADDRESS="en_GB.UTF-8"
LC_TELEPHONE="en_GB.UTF-8"
LC_MEASUREMENT="en_GB.UTF-8"
LC_IDENTIFICATION="en_GB.UTF-8"
LC_ALL=en_GB.UTF-8
```
debugger
```
$ hphp/hhvm/hhvm -m debug
hphpd> =setlocale(LC_ALL, "0")
"C"
hphpd> =setlocale(LC_ALL, "")
"en_GB.UTF-8"
hphpd> =setlocale(LC_ALL, "0")
"en_GB.UTF-8"
hphpd> =setlocale(LC_CTYPE, "fr_FR")
"fr_FR"
hphpd> =setlocale(LC_ALL, "0")
"LC_CTYPE=fr_FR;LC_NUMERIC=en_GB.UTF-8;LC_TIME=en_GB.UTF-8;LC_COLLATE=en_GB.UTF-8;LC_MONETARY=en_GB.UTF-8;LC_MESSAGES=en_GB.UTF-8;LC_PAPER=en_GB.UTF-8;LC_NAME=en_GB.UTF-8;LC_ADDRESS=en_GB.UTF-8;LC_TELEPHONE=en_GB.UTF-8;LC_MEASUREMENT=en_GB.UTF-8;LC_IDENTIFICATION=en_GB.UTF-8"
hphpd> =setlocale(LC_CTYPE, "")
"en_GB.UTF-8"
hphpd> =setlocale(LC_ALL, "0")
"en_GB.UTF-8"
```
For multiple requests
```
$ cat test.hack
<<__EntryPoint>>
function main(): void {
var_dump(setlocale(LC_ALL, "0"));
var_dump(setlocale(LC_ALL, ""));
var_dump(setlocale(LC_ALL, "fr_FR"));
var_dump(setlocale(LC_ALL, "0"));
}
$ hphp/hhvm/hhvm -m server -p 8080
```
and in another terminal...
```
$ curl http://localhost:8080/test.hack
string(1) "C"
string(11) "en_GB.UTF-8"
string(5) "fr_FR"
string(5) "fr_FR"
$ siege -c 50 -r 100 http://localhost:8080/test.hack # 5000 total requests with concurrency 50
...
$ curl http://localhost:8080/test.hack # Unchanged results
string(1) "C"
string(11) "en_GB.UTF-8"
string(5) "fr_FR"
string(5) "fr_FR"
```
Contributor
|
@fredemmott has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator. |
Contributor
|
This pull request has been merged in 1734c1e. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There are two write-only magic locale C strings for
setlocale"", which means "set the locale based on the environment""0"), which means"return the current locale"
On a fresh request,
setlocale(LC_ALL, "0")previously returned"",but
"C", not inherited from the environment (this matchesC and Python, but PHP inherits from the environment by default)
""should never be returned as a localeAdditionally, setting to
""did set the locale to be inherited from theenvironment, but calling
setlocale(LC_ALL, "")would return the empty string(indistinguishable from the initial state) rather than the locale.
This diff does not change the default locale or how setting works, but it does
correct the indicated locale, which was previously incorrect in these cases.
Future work will probably include
it without changing the state
Test Plan:
debugger
For multiple requests
and in another terminal...