1 files changed, 8 insertions, 6 deletions

diff --git a/libgemini.go b/libgemini.go
index 56e1463..20fc137 100644
--- a/libgemini.go
+++ b/libgemini.go
@@ -5,6 +5,7 @@ import (
         "crypto/tls"
         "errors"
         "io"
+        "mime"
         "net/url"
         "regexp"
         "strconv"
@@ -134,13 +135,14 @@ func ParseGeminiHeader(line string) (header *GeminiHeader, err error) {
         meta := matches[2]
 
         if int(status/10) == 2 {
-                if meta == "" {
-                        meta = DEFAULT_MIME + ";charset=" + DEFAULT_CHARSET
-                }
+                mediaType, params, err := mime.ParseMediaType(meta)
 
-                mimeType := MimeTypePattern.FindString(meta)
-                if strings.HasPrefix(mimeType, "text/") && MimeCharsetPattern.FindString(meta) == "" {
-                        meta += ";charset=" + DEFAULT_CHARSET
+                if err != nil {
+                        meta = DEFAULT_MIME + ";charset=" + DEFAULT_CHARSET
+                } else if strings.HasPrefix(mediaType, "text/") {
+                        if _, ok := params["charset"]; !ok {
+                                meta += ";charset=" + DEFAULT_CHARSET
+                        }
                 }
         }