moriyoshi Wed Mar 23 18:30:19 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- MFH: fix bug #32311 (mb_encode_mimeheader() does not properly escape
characters).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.860&r2=1.1247.2.861&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.860 php-src/NEWS:1.1247.2.861
--- php-src/NEWS:1.1247.2.860 Tue Mar 22 10:09:35 2005
+++ php-src/NEWS Wed Mar 23 18:30:17 2005
@@ -6,16 +6,17 @@
and gmp_fact() to prevent SIGFPE. (Tony)
- Changed phpize not to require libtool. (Jani)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
-- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent
- file). (Tony)
-- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob)
-- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
Fixed bugs:
+ . Bug #32311 (mb_encode_mimeheader() does not properly escape characters)
. Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
. Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
. Bug #30573 (compiler warnings in libmbfl due to invalid type cast)
. Bug #30549 (incorrect character translations for some ISO8859 charsets)
. Bug #28220 (mb_strwidth() returns wrong width values for some hangul chars)
+- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent
+ file). (Tony)
+- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob)
+- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
- Fixed several leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed several leaks in ext/filepro. (Tony)
- Fixed build system to always use bundled libtool files. (Jani)
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.1.2.3&r2=1.1.2.4&ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.3
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.4
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.3 Wed Feb 23
08:36:14 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c Wed Mar 23 18:30:18 2005
@@ -1960,6 +1960,25 @@
static int
mime_header_encoder_collector(int c, void *data)
{
+ static int qp_table[256] = {
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */
+ 0, 0, 0, 0, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 1, 0, 1, /* 0x10 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 0x50 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x60 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 0x70 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x80 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x90 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xA0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xB0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xC0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xD0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xE0 */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* 0xF0 */
+ };
+
int n;
struct mime_header_encoder_data *pe = (struct mime_header_encoder_data
*)data;
@@ -1969,7 +1988,7 @@
break;
default: /* ASCII */
- if (c >= 0x21 && c < 0x7f) { /* ASCII exclude SPACE and CTLs
*/
+ if (!qp_table[(c & 0xff)]) { /* ordinary characters */
mbfl_memory_device_output(c, &pe->tmpdev);
pe->status1 = 1;
} else if (pe->status1 == 0 && c == 0x20) { /* repeat SPACE
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
