File tree 3 files changed +4
-12
lines changed
3 files changed +4
-12
lines changed Original file line number Diff line number Diff line change @@ -132,12 +132,10 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data)
132
132
133
133
info .data_type = arg ;
134
134
info .separator = separator ;
135
- info .report_errors = 0 ;
135
+ info .report_errors = false ;
136
136
info .to_encoding = MBSTRG (internal_encoding );
137
- info .to_language = MBSTRG (language );
138
137
info .from_encodings = MBSTRG (http_input_list );
139
138
info .num_from_encodings = MBSTRG (http_input_list_size );
140
- info .from_language = MBSTRG (language );
141
139
142
140
MBSTRG (illegalchars ) = 0 ;
143
141
@@ -318,12 +316,10 @@ SAPI_POST_HANDLER_FUNC(php_mb_post_handler)
318
316
319
317
info .data_type = PARSE_POST ;
320
318
info .separator = "&" ;
321
- info .report_errors = 0 ;
319
+ info .report_errors = false ;
322
320
info .to_encoding = MBSTRG (internal_encoding );
323
- info .to_language = MBSTRG (language );
324
321
info .from_encodings = MBSTRG (http_input_list );
325
322
info .num_from_encodings = MBSTRG (http_input_list_size );
326
- info .from_language = MBSTRG (language );
327
323
328
324
php_stream_rewind (SG (request_info ).request_body );
329
325
post_data_str = php_stream_copy_to_mem (SG (request_info ).request_body , PHP_STREAM_COPY_ALL , 0 );
Original file line number Diff line number Diff line change @@ -26,9 +26,7 @@ typedef struct _php_mb_encoding_handler_info_t {
26
26
const mbfl_encoding * * from_encodings ;
27
27
size_t num_from_encodings ;
28
28
int data_type ;
29
- unsigned int report_errors : 1 ;
30
- enum mbfl_no_language to_language ;
31
- enum mbfl_no_language from_language ;
29
+ bool report_errors ;
32
30
} php_mb_encoding_handler_info_t ;
33
31
34
32
/* }}}*/
Original file line number Diff line number Diff line change @@ -1531,12 +1531,10 @@ PHP_FUNCTION(mb_parse_str)
1531
1531
1532
1532
info .data_type = PARSE_STRING ;
1533
1533
info .separator = PG (arg_separator ).input ;
1534
- info .report_errors = 1 ;
1534
+ info .report_errors = true ;
1535
1535
info .to_encoding = MBSTRG (current_internal_encoding );
1536
- info .to_language = MBSTRG (language );
1537
1536
info .from_encodings = MBSTRG (http_input_list );
1538
1537
info .num_from_encodings = MBSTRG (http_input_list_size );
1539
- info .from_language = MBSTRG (language );
1540
1538
1541
1539
detected = _php_mb_encoding_handler_ex (& info , track_vars_array , encstr );
1542
1540
You can’t perform that action at this time.
0 commit comments