mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-5.6'
* PHP-5.6: Implement RFC https://wiki.php.net/rfc/default_encoding
This commit is contained in:
commit
9a5cb51ebc
34 changed files with 464 additions and 161 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue