moriyoshi Wed Nov 13 03:26:05 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
Prevented unwanted encoding detections in mb_send_mail()
# This patch shouldn't break BC
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.141 php4/ext/mbstring/mbstring.c:1.142
--- php4/ext/mbstring/mbstring.c:1.141 Wed Nov 13 03:13:34 2002
+++ php4/ext/mbstring/mbstring.c Wed Nov 13 03:26:04 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.141 2002/11/13 08:13:34 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142 2002/11/13 08:26:04 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -3344,9 +3344,10 @@
orig_str.no_language = MBSTRG(current_language);
orig_str.val = (unsigned char *)Z_STRVAL_PP(argv[1]);
orig_str.len = Z_STRLEN_PP(argv[1]);
- orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str,
MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
- if (orig_str.no_encoding == mbfl_no_encoding_invalid) {
- orig_str.no_encoding = MBSTRG(current_internal_encoding);
+ orig_str.no_encoding = MBSTRG(current_internal_encoding);
+ if (orig_str.no_encoding == mbfl_no_encoding_invalid
+ || orig_str.no_encoding == mbfl_no_encoding_pass) {
+ orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str,
+MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
}
pstr = mbfl_mime_header_encode(&orig_str, &conv_str, tran_cs,
head_enc, "\n", sizeof("Subject: [PHP-jp nnnnnnnn]") TSRMLS_CC);
if (pstr != NULL) {
@@ -3365,9 +3366,11 @@
orig_str.no_language = MBSTRG(current_language);
orig_str.val = Z_STRVAL_PP(argv[2]);
orig_str.len = Z_STRLEN_PP(argv[2]);
- orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str,
MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
- if (orig_str.no_encoding == mbfl_no_encoding_invalid) {
- orig_str.no_encoding = MBSTRG(current_internal_encoding);
+ orig_str.no_encoding = MBSTRG(current_internal_encoding);
+
+ if (orig_str.no_encoding == mbfl_no_encoding_invalid
+ || orig_str.no_encoding == mbfl_no_encoding_pass) {
+ orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str,
+MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
}
pstr = mbfl_convert_encoding(&orig_str, &conv_str, tran_cs TSRMLS_CC);
if (pstr != NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
