mirror of
https://github.com/php/php-src.git
synced 2025-08-18 23:18:56 +02:00
Added conversion support from script character encoding to internal character encoding. This feature is very useful for japanese who uses Shift_JIS encoding because some of characters in Shift_JIS are including '0x5c' and it causes some troubles on Zend parser. This patch is made by Masaki Fujimoto.
This commit is contained in:
parent
2b5beee5ad
commit
f30b722f14
6 changed files with 295 additions and 4 deletions
|
@ -21,6 +21,10 @@
|
|||
|
||||
#include "php_apache_http.h"
|
||||
|
||||
#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
|
||||
#include "ext/mbstring/mbstring.h"
|
||||
#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */
|
||||
|
||||
#undef shutdown
|
||||
|
||||
/* {{{ Prototypes
|
||||
|
@ -459,6 +463,11 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
|
|||
fh.opened_path = NULL;
|
||||
fh.free_filename = 0;
|
||||
fh.type = ZEND_HANDLE_FILENAME;
|
||||
|
||||
#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
|
||||
php_mbstring_set_zend_encoding(TSRMLS_C);
|
||||
#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */
|
||||
|
||||
zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &fh);
|
||||
return OK;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue