php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed: output encoding translation by mb_output_handler() in ext/mbstring was not usable when Content-Type is set by header().

Browse Source
This commit is contained in:
Rui Hirokawa
2002-07-27 13:58:16 +00:00
parent 70d7184624
commit fbbeaec630
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ext/mbstring/mbstring.c
View File

@@ -1728,10 +1728,12 @@ PHP_FUNCTION(mb_output_handler)
size_t arg_string_len;
long arg_status;
mbfl_string string, result;
const char *mimetype, *charset;
const char *charset;
char *p;
enum mbfl_no_encoding encoding;
int last_feed, len;
unsigned char send_text_mimetype = 0;
char *s, *mimetype = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &arg_string, &arg_string_len, &arg_status) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -1749,9 +1751,22 @@ PHP_FUNCTION(mb_output_handler)
if (encoding == mbfl_no_encoding_pass) {
RETURN_STRINGL(arg_string, arg_string_len, 1);
}
/* if content-type is not yet set, set it and activate the converter */
if (SG(sapi_headers).send_default_content_type ) {
/* analyze mime type */
if (SG(sapi_headers).mimetype &&
strncmp(SG(sapi_headers).mimetype, "text/", 5) == 0) {
if ((s = strchr(SG(sapi_headers).mimetype,';')) == NULL){
mimetype = estrdup(SG(sapi_headers).mimetype);
} else {
mimetype = estrndup(SG(sapi_headers).mimetype,s-SG(sapi_headers).mimetype);
}
send_text_mimetype = 1;
} else if (SG(sapi_headers).send_default_content_type) {
mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE;
}
/* if content-type is not yet set, set it and activate the converter */
if (SG(sapi_headers).send_default_content_type || send_text_mimetype) {
charset = mbfl_no2preferred_mime_name(encoding);
if (charset) {
len = (sizeof ("Content-Type:")-1) + strlen(mimetype) + (sizeof (";charset=")-1) + strlen(charset) + 1;
@@ -1765,6 +1780,9 @@ PHP_FUNCTION(mb_output_handler)
}
/* activate the converter */
MBSTRG(outconv) = mbfl_buffer_converter_new(MBSTRG(current_internal_encoding), encoding, 0 TSRMLS_CC);
if (send_text_mimetype){
efree(mimetype);
}
}
}

7
main/SAPI.c
View File

@@ -490,6 +490,10 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC)
}
mimetype = estrdup(ptr);
newlen = sapi_apply_default_charset(&mimetype, len TSRMLS_CC);
if (!SG(sapi_headers).mimetype){
SG(sapi_headers).mimetype = estrdup(mimetype);
}
if (newlen != 0) {
newlen += sizeof("Content-type: ");
newheader = emalloc(newlen);
@@ -677,6 +681,9 @@ SAPI_API int sapi_send_headers(TSRMLS_D)
if (SG(sapi_headers).http_status_line) {
efree(SG(sapi_headers).http_status_line);
}
if (SG(sapi_headers).mimetype) {
efree(SG(sapi_headers).mimetype);
}
return ret;
}

1
main/SAPI.h
View File

@@ -51,6 +51,7 @@ typedef struct {
zend_llist headers;
int http_response_code;
unsigned char send_default_content_type;
char *mimetype;
char *http_status_line;
} sapi_headers_struct;