From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Mon, 1 Dec 2003 23:49:20 +0000 (+0000)
Subject: Loosen error check. There's no reason to forbid a single '=' occurrence
X-Git-Tag: php-5.0.0b3RC1~434
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca2aaeee5e3d3849cd45ebbadc8534b04e052951;p=php

Loosen error check. There's no reason to forbid a single '=' occurrence
in an unencoded string.
Fix white space handing. Meaningful spaces have got stripped wrongly
before this patch.
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 23a19a3fe7..ed236ffc2e 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1248,22 +1248,17 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st
 
 			case 1:
 				if (*p1 != '?') {
-					if ((mode & PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR)) {
-						err = _php_iconv_appendl(pretval, encoded_word, (size_t)((p1 + 1) - encoded_word), cd_pl); 
-						if (err != PHP_ICONV_ERR_SUCCESS) {
-							goto out;
-						}
-						encoded_word = NULL;
-						if ((mode & PHP_ICONV_MIME_DECODE_STRICT)) {
-							scan_stat = 12;
-						} else {
-							scan_stat = 0;
-						}
-						break;
-					} else {
-						err = PHP_ICONV_ERR_MALFORMED;
+					err = _php_iconv_appendl(pretval, encoded_word, (size_t)((p1 + 1) - encoded_word), cd_pl); 
+					if (err != PHP_ICONV_ERR_SUCCESS) {
 						goto out;
 					}
+					encoded_word = NULL;
+					if ((mode & PHP_ICONV_MIME_DECODE_STRICT)) {
+						scan_stat = 12;
+					} else {
+						scan_stat = 0;
+					}
+					break;
 				}
 				csname = p1 + 1;
 				scan_stat = 2;
@@ -1596,6 +1591,8 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st
 						encoded_word = NULL;
 						if ((mode & PHP_ICONV_MIME_DECODE_STRICT)) {
 							scan_stat = 12;
+						} else {
+							scan_stat = 0;
 						}
 						break;
 				}