iso8859_1_to_utf8 per #141

JuliaWeb · Jan 14, 2018 · 6d978be · 6d978be
1 parent be69847
commit 6d978be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Messages.jl b/src/Messages.jl
@@ -65,7 +65,8 @@ export Message, Request, Response, HeaderSizeError,
        header, hasheader, setheader, defaultheader, appendheader,
        mkheaders, readheaders, headerscomplete, readtrailers, writeheaders,
        readstartline!, writestartline,
-       bodylength, unknown_length
+       bodylength, unknown_length,
+       load
 
 import ..HTTP
 
@@ -365,6 +366,16 @@ function Base.String(m::Message)
 end
 
 
+#Like https://github.com/JuliaIO/FileIO.jl/blob/v0.6.1/src/FileIO.jl#L19 ?
+function load(m::Message)
+    if hasheader(m, "Content-Type", "ISO-8859-1")
+        return iso8859_1_to_utf8(m.body)
+    else
+        String(m.body)
+    end
+end
+
+
 """
     readstartline!(::Parsers.Message, ::Message)
 

diff --git a/src/Strings.jl b/src/Strings.jl
@@ -52,7 +52,6 @@ end
 Convert from ISO8859_1 to UTF8.
 """
 
-iso8859_1_to_utf8(str::String) = iso8859_1_to_utf8(Vector{UInt8}(str))
 function iso8859_1_to_utf8(bytes::Vector{UInt8})
     io = IOBuffer()
     for b in bytes