diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-01-09 01:41:13 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-01-09 01:41:13 +0300 |
| commit | 7b4808a6471655b44e65cfb4585c01f2efea444a (patch) | |
| tree | 079cd73b2731c42112c96d8cab2b0a0c8b527348 /ext/standard/basic_functions.h | |
| parent | ed8ebd6ce40650d54a283e3296151d86e12d7ece (diff) | |
| download | php-git-7b4808a6471655b44e65cfb4585c01f2efea444a.tar.gz | |
Fixed bug #68636 (setlocale no longer returns current value per category).
Diffstat (limited to 'ext/standard/basic_functions.h')
| -rw-r--r-- | ext/standard/basic_functions.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index fe09dc5e25..8820148a63 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -168,7 +168,8 @@ typedef struct _php_basic_globals { HashTable putenv_ht; zval strtok_zval; char *strtok_string; - zend_string *locale_string; + zend_string *locale_string; /* current LC_CTYPE locale (or NULL for 'C') */ + zend_bool locale_changed; /* locale was changed and has to be restored */ char *strtok_last; char strtok_table[256]; zend_ulong strtok_len; |