Merge pull request #25 from meister/patch-1

Update mimelib.js
andris9 · Aug 7, 2014 · 8387018 · 8387018
2 parents de03001 + 77b88d8
commit 8387018
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/mimelib.js b/lib/mimelib.js
@@ -308,7 +308,7 @@ module.exports.mimeFunctions = {
 
         var fromCharset, encoding, match;
 
-        match = str.match(/^\=\?([\w_\-]+)\?([QqBb])\?([^\?]+)\?\=$/i);
+        match = str.match(/^\=\?([\w_\-]+)\?([QqBb])\?([^\?]*)\?\=$/i);
         if (!match) {
             return convert(str, toCharset);
         }
@@ -332,8 +332,8 @@ module.exports.mimeFunctions = {
         var curCharset;
 
         str = (str || "").toString().
-        replace(/(=\?[^?]+\?[QqBb]\?[^?]+\?=)\s+(?==\?[^?]+\?[QqBb]\?[^?]+\?=)/g, "$1").
-        replace(/\=\?([\w_\-]+)\?([QqBb])\?[^\?]+\?\=/g, (function(mimeWord, charset, encoding) {
+        replace(/(=\?[^?]+\?[QqBb]\?[^?]+\?=)\s+(?==\?[^?]+\?[QqBb]\?[^?]*\?=)/g, "$1").
+        replace(/\=\?([\w_\-]+)\?([QqBb])\?[^\?]*\?\=/g, (function(mimeWord, charset, encoding) {
             curCharset = charset + encoding;
             return this.decodeMimeWord(mimeWord);
         }).bind(this));
@@ -581,4 +581,4 @@ function checkRanges(nr, ranges) {
         }
     }
     return false;
-}
+}