Merge branch 'PHP-5.6'

* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding

diff --cc main/SAPI.h
Simple merge

diff --cc main/main.c
Simple merge

diff --cc main/php.h
index c2d0d936caadd1b6b1706908316b328cd25bfd03,4330479d50113351d7230a5ee57c36832c55b356..f9cfd2d7f27e161c721e022a78068824b5807cf5
--- 1/main/php.h
--- 2/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 main/php_globals.h
Simple merge

diff --cc php.ini-development
index 137574bdee761269f933ee7836e960d0d29b65ed,50fbba1fcf4c425d8d3e91cf1e69a06550961256..ed4ddd5f8338c549f3457e9597e1778a511c2757
--- 1/php.ini-development
--- 2/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 3fa1788a00034e08a023959790f579d037381025,fcd96bfad9ca9409baa541eb811b9f32199ecb56..4a8f0e4e7771380b049fcac6f5a4ca45b6ad7b3e
--- 1/php.ini-production
--- 2/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 ;
  ;;;;;;;;;;;;;;;;;;;;;;;;;