com php-src: Merge branch 'PHP-5.6': main/SAPI.h main/main.c main/php.h main/php_globals.h php.ini-development php.ini-prod uction

Commit: 9a5cb51ebcb778b0cac39928fb6fcd5c604fe6cd Author: Yasuo Ohgaki <yohgaki@php.net> Thu, 13 Feb 2014 11:56:54 +0900 Parents: c9e9151bb3c5bc2e257a9e23d53b6f0234aac743 cbd108abf19d9fb9ae1d4ccd153215f56a2763e8 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a5cb51ebcb778b0cac39928fb6fcd5c604fe6cd Log: Merge branch 'PHP-5.6' * PHP-5.6: Implement RFC https://wiki.php.net/rfc/default_encoding Changed paths: MM main/SAPI.h MM main/main.c MM main/php.h MM main/php_globals.h MM php.ini-development MM php.ini-production Diff: diff --cc main/php.h index c2d0d93,4330479..f9cfd2d --- a/main/php.h +++ b/main/php.h @@@ -26,9 -26,10 +26,10 @@@ #include <dmalloc.h> #endif -#define PHP_API_VERSION 20131106 +#define PHP_API_VERSION 20131218 #define PHP_HAVE_STREAMS #define YYDEBUG 0 + #define PHP_DEFAULT_CHARSET "UTF-8" #include "php_version.h" #include "zend.h" diff --cc php.ini-development index 137574b,50fbba1..ed4ddd5 --- a/php.ini-development +++ b/php.ini-development @@@ -678,10 -678,34 +678,27 @@@ auto_append_file ; http://php.net/default-mimetype default_mimetype = "text/html" - ; PHP's default character set is set to empty. + ; PHP's default character set is set to UTF-8 ; http://php.net/default-charset - ;default_charset = "UTF-8" + default_charset = "UTF-8" + + ; PHP internal character encoding is set to empty. + ; If empty, default_charset is used. + ; http://php.net/internal-encoding + ;internal_encoding = + + ; PHP input character encoding is set to empty. + ; If empty, default_charset is used. + ; http://php.net/input-encoding + ;input_encoding = + + ; PHP output character encoding is set to empty. + ; If empty, default_charset is used. + ; mbstring or iconv output handler is used. + ; See also output_buffer. + ; http://php.net/output-encoding + ;output_encoding = -; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is -; to disable this feature and it will be removed in a future version. -; If post reading is disabled through enable_post_data_reading, -; $HTTP_RAW_POST_DATA is *NOT* populated. -; http://php.net/always-populate-raw-post-data -;always_populate_raw_post_data = -1 - ;;;;;;;;;;;;;;;;;;;;;;;;; ; Paths and Directories ; ;;;;;;;;;;;;;;;;;;;;;;;;; diff --cc php.ini-production index 3fa1788,fcd96bf..4a8f0e4 --- a/php.ini-production +++ b/php..ini-production @@@ -680,8 -680,30 +680,23 @@@ default_mimetype = "text/html ; PHP's default character set is set to empty. ; http://php.net/default-charset - ;default_charset = "UTF-8" + default_charset = "UTF-8" + + ; PHP internal character encoding is set to empty. + ; If empty, default_charset is used. + ; http://php.net/internal-encoding + ;internal_encoding = + + ; PHP input character encoding is set to empty. + ; http://php.net/input-encoding + ;input_encoding = + + ; PHP output character encoding is set to empty. + ; mbstring or iconv output handler is used. + ; See also output_buffer. + ; http://php.net/output-encoding + ;output_encoding = -; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is -; to disable this feature and it will be removed in a future version. -; If post reading is disabled through enable_post_data_reading, -; $HTTP_RAW_POST_DATA is *NOT* populated. -; http://php.net/always-populate-raw-post-data -;always_populate_raw_post_data = -1 - ;;;;;;;;;;;;;;;;;;;;;;;;; ; Paths and Directories ; ;;;;;;;;;;;;;;;;;;;;;;;;;