From 6b5c53b03fca22f610a1828839636ff494c19922 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sat, 28 Jun 2014 17:34:42 -0500
Subject: gist-logs: fix up encoding before passing the response body to OkJson

Fixes Homebrew/homebrew#30519.
---
 Library/Contributions/cmd/brew-gist-logs.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Contributions/cmd/brew-gist-logs.rb b/Library/Contributions/cmd/brew-gist-logs.rb
index fe71865f3..d36567f3e 100755
--- a/Library/Contributions/cmd/brew-gist-logs.rb
+++ b/Library/Contributions/cmd/brew-gist-logs.rb
@@ -76,7 +76,14 @@ def post path, data
   request.body = Utils::JSON.dump(data)
   response = http.request(request)
   raise HTTP_Error, response if response.code != '201'
-  Utils::JSON.load(response.body)
+
+  if response["Content-Type"].downcase == "application/json; charset=utf-8"
+    body = response.body.dup.force_encoding(Encoding::UTF_8)
+  else
+    body = response.body.encode(Encoding::UTF_8, undef: :replace)
+  end
+
+  Utils::JSON.load(body)
 end
 
 class HTTP_Error < RuntimeError
-- 
cgit v1.2.3