From: Derick Rethans <derick@php.net>
Date: Fri, 24 Feb 2006 16:05:38 +0000 (+0000)
Subject: - MFH: Fixed issue with iconv_mime_decode where the "encoding" would only allow
X-Git-Tag: php-5.1.3RC1~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=016dbe414e5cd8c849d91f6ebbf3a4d4937c8c8a;p=php

- 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 8f4d8992df..d14a9e1574 100644
--- 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 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;