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/SAPI.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/SAPI.h')
| -rw-r--r-- | main/SAPI.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/SAPI.h b/main/SAPI.h index 71942f5663..ecb1743820 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -21,6 +21,7 @@ #ifndef SAPI_H #define SAPI_H +#include "php.h" #include "zend.h" #include "zend_API.h" #include "zend_llist.h" @@ -291,7 +292,7 @@ struct _sapi_post_entry { #define SAPI_HEADER_SEND_FAILED 3 #define SAPI_DEFAULT_MIMETYPE "text/html" -#define SAPI_DEFAULT_CHARSET "" +#define SAPI_DEFAULT_CHARSET PHP_DEFAULT_CHARSET #define SAPI_PHP_VERSION_HEADER "X-Powered-By: PHP/" PHP_VERSION #define SAPI_POST_READER_FUNC(post_reader) void post_reader(TSRMLS_D) |