summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2006-02-24 16:05:38 +0000
committerDerick Rethans <derick@php.net>2006-02-24 16:05:38 +0000
commit016dbe414e5cd8c849d91f6ebbf3a4d4937c8c8a (patch)
treef53f14c2c5f7c7bc53a0f2e950cb0c686c526f7e /ext
parent6520ff9afca625a7b9d9fb00acd1f816a54dabde (diff)
downloadphp-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.
Diffstat (limited to 'ext')
-rw-r--r--ext/iconv/iconv.c2
1 files changed, 2 insertions, 0 deletions
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;