Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
efd9a717
Commit
efd9a717
authored
May 30, 2012
by
Saito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
solve the binary problem
parent
e1d1673e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
lib/gitlab/encode.rb
lib/gitlab/encode.rb
+7
-3
No files found.
lib/gitlab/encode.rb
View file @
efd9a717
...
@@ -8,17 +8,21 @@ module Gitlab
...
@@ -8,17 +8,21 @@ module Gitlab
# return nil if message is nil
# return nil if message is nil
return
nil
unless
message
return
nil
unless
message
# return message if message type is binary
detect
=
CharlockHolmes
::
EncodingDetector
.
detect
(
message
)
return
message
if
detect
[
:type
]
==
:binary
# if message is utf-8 encoding, just return it
# if message is utf-8 encoding, just return it
message
.
force_encoding
(
"utf-8"
)
message
.
force_encoding
(
"utf-8"
)
return
message
if
message
.
valid_encoding?
return
message
if
message
.
valid_encoding?
# if message is not utf-8 encoding, detect and convert it
# if message is not utf-8 encoding, convert it
detect
=
CharlockHolmes
::
EncodingDetector
.
detect
(
message
)
if
detect
[
:encoding
]
if
detect
[
:encoding
]
&&
detect
[
:confidence
]
>
60
message
.
force_encoding
(
detect
[
:encoding
])
message
.
force_encoding
(
detect
[
:encoding
])
message
.
encode!
(
"utf-8"
,
detect
[
:encoding
],
:undef
=>
:replace
,
:replace
=>
""
,
:invalid
=>
:replace
)
message
.
encode!
(
"utf-8"
,
detect
[
:encoding
],
:undef
=>
:replace
,
:replace
=>
""
,
:invalid
=>
:replace
)
end
end
# ensure message encoding is utf8
message
.
valid_encoding?
?
message
:
raise
message
.
valid_encoding?
?
message
:
raise
# Prevent app from crash cause of encoding errors
# Prevent app from crash cause of encoding errors
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment