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

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

diff --git a/NEWS b/NEWS
index 8f4d8992df1cbce2eaf0179cca798a6c71335b29..d14a9e1574ff5a75a748dfe5d34f5f8abb4f24fd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 4b3edb1c94385e0b591388f3d15cd9940b21dc78..af8e83eeec6c3b248723e3bed77695b0074d2c55 100644 (file)
--- 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;