moriyoshi Fri Jan 31 09:28:44 2003 EDT
Modified files: (Branch: PHP_4_3)
/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
Log:
MFH: fixed a mb_send_mail() bug.
# sorry for mixing WS fix
Index: php4/ext/mbstring/mbfilter.c
diff -u php4/ext/mbstring/mbfilter.c:1.52 php4/ext/mbstring/mbfilter.c:1.52.2.1
--- php4/ext/mbstring/mbfilter.c:1.52 Wed Nov 13 06:57:59 2002
+++ php4/ext/mbstring/mbfilter.c Fri Jan 31 09:28:43 2003
@@ -80,7 +80,7 @@
*
*/
-/* $Id: mbfilter.c,v 1.52 2002/11/13 11:57:59 moriyoshi Exp $ */
+/* $Id: mbfilter.c,v 1.52.2.1 2003/01/31 14:28:43 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.142.2.5 php4/ext/mbstring/mbstring.c:1.142.2.6
--- php4/ext/mbstring/mbstring.c:1.142.2.5 Sun Nov 24 14:21:58 2002
+++ php4/ext/mbstring/mbstring.c Fri Jan 31 09:28:44 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.142.2.5 2002/11/24 19:21:58 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.6 2003/01/31 14:28:44 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -3375,11 +3375,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.1.2.1
php4/ext/mbstring/tests/mb_send_mail01.phpt:1.1.2.2
--- php4/ext/mbstring/tests/mb_send_mail01.phpt:1.1.2.1 Thu Nov 21 13:19:27 2002
+++ php4/ext/mbstring/tests/mb_send_mail01.phpt Fri Jan 31 09:28:44 2003
@@ -28,11 +28,11 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
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.2.2.1
--- 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:28:44 2003
@@ -28,7 +28,7 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
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.2.2.1
php4/ext/mbstring/tests/mb_send_mail03.phpt:1.2.2.2
--- php4/ext/mbstring/tests/mb_send_mail03.phpt:1.2.2.1 Thu Nov 21 13:19:27 2002
+++ php4/ext/mbstring/tests/mb_send_mail03.phpt Fri Jan 31 09:28:44 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 = '[EMAIL PROTECTED]';
-
-/* 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: [EMAIL PROTECTED]
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-test
-To: [EMAIL PROTECTED]
-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 = '[EMAIL PROTECTED]';
+
+/* 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: [EMAIL PROTECTED]
+Subject: %s
+Mime-Version: 1.0
+Content-Type: text/plain; charset=%s
+Content-Transfer-Encoding: %s
+
+dGVzdA==
+To: [EMAIL PROTECTED]
+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.1.2.1
php4/ext/mbstring/tests/mb_send_mail04.phpt:1.1.2.2
--- php4/ext/mbstring/tests/mb_send_mail04.phpt:1.1.2.1 Thu Nov 21 13:19:27 2002
+++ php4/ext/mbstring/tests/mb_send_mail04.phpt Fri Jan 31 09:28:44 2003
@@ -28,7 +28,7 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
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.1.2.1
php4/ext/mbstring/tests/mb_send_mail05.phpt:1.1.2.2
--- php4/ext/mbstring/tests/mb_send_mail05.phpt:1.1.2.1 Thu Nov 14 09:19:03 2002
+++ php4/ext/mbstring/tests/mb_send_mail05.phpt Fri Jan 31 09:28:44 2003
@@ -31,7 +31,7 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
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.1.2.1
php4/ext/mbstring/tests/mb_send_mail06.phpt:1.1.2.2
--- php4/ext/mbstring/tests/mb_send_mail06.phpt:1.1.2.1 Thu Nov 14 09:19:03 2002
+++ php4/ext/mbstring/tests/mb_send_mail06.phpt Fri Jan 31 09:28:44 2003
@@ -31,7 +31,7 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
Subject: =?BIG5?B?tPrF5yBUcmFkaXRpb25hbCBDaGluZXNl?=
Mime-Version: 1.0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
