cvs: php4 /ext/mbstring mbfilter.c mbstring.c /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_mail04.phpt
mb_send_mail05.phpt mb_send_mail06.phpt mb_send_mail07.phpt

moriyoshi Fri Jan 31 09:15:50 2003 EDT Modified files: /php4/ext/mbstring mbfilter.c mbstring.c /php4/ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_mail04.phpt mb_send_mail05.phpt mb_send_mail06.phpt mb_send_mail07.phpt Log: Fixed a mb_send_mail() bug that has been reported in php-i18n@lists.php.net See http://lists.php.net/article.php?group=php.i18n&article=427 Index: php4/ext/mbstring/mbfilter.c diff -u php4/ext/mbstring/mbfilter.c:1.52 php4/ext/mbstring/mbfilter.c:1.53 --- php4/ext/mbstring/mbfilter.c:1.52 Wed Nov 13 06:57:59 2002 +++ php4/ext/mbstring/mbfilter.c Fri Jan 31 09:15:49 2003 @@ -80,7 +80,7 @@ * */ -/* $Id: mbfilter.c,v 1.52 2002/11/13 11:57:59 moriyoshi Exp $ */ +/* $Id: mbfilter.c,v 1.53 2003/01/31 14:15:49 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H @@ -7440,8 +7440,10 @@ if (filter1 == NULL) { return NULL; } - filter2->illegal_mode = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR; - filter2->illegal_substchar = 0x3f; /* '?' */ + if (filter2 != NULL) { + filter2->illegal_mode = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR; + filter2->illegal_substchar = 0x3f; /* '?' */ + } mbfl_memory_device_init(&device, string->len, (string->len >> 2) + 8 TSRMLS_CC); /* feed data */ Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.155 php4/ext/mbstring/mbstring.c:1.156 --- php4/ext/mbstring/mbstring.c:1.155 Tue Jan 21 09:53:16 2003 +++ php4/ext/mbstring/mbstring.c Fri Jan 31 09:15:49 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.155 2003/01/21 14:53:16 iliaa Exp $ */ +/* $Id: mbstring.c,v 1.156 2003/01/31 14:15:49 moriyoshi Exp $ */ /* * PHP4 Multibyte String module "mbstring" @@ -2830,11 +2830,21 @@ || 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); + + pstr = NULL; + { + mbfl_string tmpstr; + + if (mbfl_convert_encoding(&orig_str, &tmpstr, tran_cs TSRMLS_CC) != NULL) { + tmpstr.no_encoding=mbfl_no_encoding_8bit; + pstr = mbfl_convert_encoding(&tmpstr, &conv_str, body_enc TSRMLS_CC); + efree(tmpstr.val); + } + } if (pstr != NULL) { message_buf = message = (char *)pstr->val; } else { - message = Z_STRVAL_PP(argv[2]); + message = estrndup(Z_STRVAL_PP(argv[2]), Z_STRLEN_PP(argv[2])); } } else { /* this is not really an error, so it is allowed. */ Index: php4/ext/mbstring/tests/mb_send_mail01.phpt diff -u php4/ext/mbstring/tests/mb_send_mail01.phpt:1.2 php4/ext/mbstring/tests/mb_send_mail01.phpt:1.3 --- php4/ext/mbstring/tests/mb_send_mail01.phpt:1.2 Thu Nov 21 13:12:53 2002 +++ php4/ext/mbstring/tests/mb_send_mail01.phpt Fri Jan 31 09:15:49 2003 @@ -28,11 +28,11 @@ Content-Type: text/plain; charset=%s Content-Transfer-Encoding: %s -test +dGVzdA== To: example@example.com Subject: test neutral Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: BASE64 -test +dGVzdA== Index: php4/ext/mbstring/tests/mb_send_mail02.phpt diff -u php4/ext/mbstring/tests/mb_send_mail02.phpt:1.2 php4/ext/mbstring/tests/mb_send_mail02.phpt:1.3 --- php4/ext/mbstring/tests/mb_send_mail02.phpt:1.2 Wed Nov 13 03:27:17 2002 +++ php4/ext/mbstring/tests/mb_send_mail02.phpt Fri Jan 31 09:15:49 2003 @@ -28,7 +28,7 @@ Content-Type: text/plain; charset=%s Content-Transfer-Encoding: %s -test +dGVzdA== To: example@example.com Subject: =?ISO-2022-JP?B?GyRCJUYlOSVIGyhCIEphcGFuZXNl?= Mime-Version: 1.0 Index: php4/ext/mbstring/tests/mb_send_mail03.phpt diff -u php4/ext/mbstring/tests/mb_send_mail03.phpt:1.3 php4/ext/mbstring/tests/mb_send_mail03.phpt:1.4 --- php4/ext/mbstring/tests/mb_send_mail03.phpt:1.3 Thu Nov 21 13:12:53 2002 +++ php4/ext/mbstring/tests/mb_send_mail03.phpt Fri Jan 31 09:15:49 2003 @@ -1,38 +1,38 @@ ---TEST-- -mb_send_mail() test 3 (lang=English) ---SKIPIF-- -<?php -if (@mb_send_mail() === false || !mb_language("english")) { - die("skip mb_send_mail() not available"); -} -?> ---INI-- -sendmail_path=cat ---FILE-- -<?php -$to = 'example@example.com'; - -/* default setting */ -mb_send_mail($to, mb_language(), "test"); - -/* English (iso-8859-1) */ -if (mb_language("english")) { - mb_internal_encoding("ISO-8859-1"); - mb_send_mail($to, "test ".mb_language(), "test"); -} -?> ---EXPECTF-- -To: example@example.com -Subject: %s -Mime-Version: 1.0 -Content-Type: text/plain; charset=%s -Content-Transfer-Encoding: %s - -test -To: example@example.com -Subject: test English -Mime-Version: 1.0 -Content-Type: text/plain; charset=%s-8859-1 -Content-Transfer-Encoding: 8bit - -test +--TEST-- +mb_send_mail() test 3 (lang=English) +--SKIPIF-- +<?php +if (@mb_send_mail() === false || !mb_language("english")) { + die("skip mb_send_mail() not available"); +} +?> +--INI-- +sendmail_path=cat +--FILE-- +<?php +$to = 'example@example.com'; + +/* default setting */ +mb_send_mail($to, mb_language(), "test"); + +/* English (iso-8859-1) */ +if (mb_language("english")) { + mb_internal_encoding("ISO-8859-1"); + mb_send_mail($to, "test ".mb_language(), "test"); +} +?> +--EXPECTF-- +To: example@example.com +Subject: %s +Mime-Version: 1.0 +Content-Type: text/plain; charset=%s +Content-Transfer-Encoding: %s + +dGVzdA== +To: example@example.com +Subject: test English +Mime-Version: 1.0 +Content-Type: text/plain; charset=%s-8859-1 +Content-Transfer-Encoding: 8bit + +test Index: php4/ext/mbstring/tests/mb_send_mail04.phpt diff -u php4/ext/mbstring/tests/mb_send_mail04.phpt:1.2 php4/ext/mbstring/tests/mb_send_mail04.phpt:1.3 --- php4/ext/mbstring/tests/mb_send_mail04.phpt:1.2 Thu Nov 21 13:12:53 2002 +++ php4/ext/mbstring/tests/mb_send_mail04.phpt Fri Jan 31 09:15:49 2003 @@ -28,7 +28,7 @@ Content-Type: text/plain; charset=%s Content-Transfer-Encoding: %s -test +dGVzdA== To: example@example.com Subject: =?ISO-8859-15?Q?Pr=FCfung=20German?= Mime-Version: 1.0 Index: php4/ext/mbstring/tests/mb_send_mail05.phpt diff -u php4/ext/mbstring/tests/mb_send_mail05.phpt:1.2 php4/ext/mbstring/tests/mb_send_mail05.phpt:1.3 --- php4/ext/mbstring/tests/mb_send_mail05.phpt:1.2 Wed Nov 13 11:52:48 2002 +++ php4/ext/mbstring/tests/mb_send_mail05.phpt Fri Jan 31 09:15:49 2003 @@ -31,7 +31,7 @@ Content-Type: text/plain; charset=%s Content-Transfer-Encoding: %s -test +dGVzdA== To: example@example.com Subject: =?HZ-GB-2312?B?fnsyYlFpfn0gU2ltcGxpZmllZCBD?= =?HZ-GB-2312?B?aGluZXNl?= Index: php4/ext/mbstring/tests/mb_send_mail06.phpt diff -u php4/ext/mbstring/tests/mb_send_mail06.phpt:1.2 php4/ext/mbstring/tests/mb_send_mail06.phpt:1.3 --- php4/ext/mbstring/tests/mb_send_mail06.phpt:1.2 Wed Nov 13 11:52:48 2002 +++ php4/ext/mbstring/tests/mb_send_mail06.phpt Fri Jan 31 09:15:49 2003 @@ -31,7 +31,7 @@ Content-Type: text/plain; charset=%s Content-Transfer-Encoding: %s -test +dGVzdA== To: example@example.com Subject: =?BIG5?B?tPrF5yBUcmFkaXRpb25hbCBDaGluZXNl?= Mime-Version: 1.0 Index: php4/ext/mbstring/tests/mb_send_mail07.phpt diff -u php4/ext/mbstring/tests/mb_send_mail07.phpt:1.1 php4/ext/mbstring/tests/mb_send_mail07.phpt:1.2 --- php4/ext/mbstring/tests/mb_send_mail07.phpt:1.1 Sat Nov 23 00:26:18 2002 +++ php4/ext/mbstring/tests/mb_send_mail07.phpt Fri Jan 31 09:15:49 2003 @@ -31,7 +31,7 @@ Content-Type: text/plain; charset=%s Content-Transfer-Encoding: %s -test +dGVzdA== To: example@example.com Subject: =?ISO-2022-KR?B?GyQpQw5FVz06Ri4PIEtvcmVhbg8=?= Mime-Version: 1.0