diff options
| author | Derick Rethans <derick@php.net> | 2006-02-24 16:05:38 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2006-02-24 16:05:38 +0000 |
| commit | 016dbe414e5cd8c849d91f6ebbf3a4d4937c8c8a (patch) | |
| tree | f53f14c2c5f7c7bc53a0f2e950cb0c686c526f7e | |
| parent | 6520ff9afca625a7b9d9fb00acd1f816a54dabde (diff) | |
| download | php-git-016dbe414e5cd8c849d91f6ebbf3a4d4937c8c8a.tar.gz | |
- MFH: Fixed issue with iconv_mime_decode where the "encoding" would only allow
upper case specifiers.
#- See RFC 2047, section 2.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -24,6 +24,8 @@ PHP NEWS - Added ReflectionClass::newInstanceArgs($args). (Marcus) - Added imap_savebody() that allows message body to be written to a file. (Mike) +- Fixed issue with iconv_mime_decode where the "encoding" would only allow + upper case specifiers. (Derick) - Fixed tiger hash algorithm generating wrong results on big endian platforms. (Mike) - Fixed crash with DOMImplementation::createDocumentType("name:"). (Mike) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 4b3edb1c94..af8e83eeec 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -1395,11 +1395,13 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st case 3: /* expecting a encoding scheme specifier */ switch (*p1) { + case 'b': case 'B': enc_scheme = PHP_ICONV_ENC_SCHEME_BASE64; scan_stat = 4; break; + case 'q': case 'Q': enc_scheme = PHP_ICONV_ENC_SCHEME_QPRINT; scan_stat = 4; |