- Fixed issue with iconv_mime_decode where the "encoding" would only allow

  upper case specifiers.
#- See RFC 2047, section 2.

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 34c78f5e0cc4c5c6d9a7893bf56fa998862085cf..ce3464624d2d126a9abc4a150dedc438eafcd9f2 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1398,11 +1398,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;