diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2014-02-13 11:56:54 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2014-02-13 11:56:54 +0900 |
| commit | 9a5cb51ebcb778b0cac39928fb6fcd5c604fe6cd (patch) | |
| tree | 196bec3fad7cd0e8f2a26bc298b803d2383d0f58 /main/php_globals.h | |
| parent | c9e9151bb3c5bc2e257a9e23d53b6f0234aac743 (diff) | |
| parent | cbd108abf19d9fb9ae1d4ccd153215f56a2763e8 (diff) | |
| download | php-git-9a5cb51ebcb778b0cac39928fb6fcd5c604fe6cd.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Implement RFC https://wiki.php.net/rfc/default_encoding
Diffstat (limited to 'main/php_globals.h')
| -rw-r--r-- | main/php_globals.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/php_globals.h b/main/php_globals.h index b8f64d6d31..d8ba6142d4 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -96,6 +96,10 @@ struct _php_core_globals { char *auto_prepend_file; char *auto_append_file; + char *input_encoding; + char *internal_encoding; + char *output_encoding; + arg_separators arg_separator; char *variables_order; |