better fix for encoding error

tsl0922
1 parent 4e055e8a
Showing 1 changed file with 1 additions and 3 deletions Show diff stats
lib/gitlab/backend/grack_auth.rb
@@ -109,11 +109,9 @@ module Grack
       else
         input = @request.body.read
       end
-      # force utf-8 encoding
-      input.encode!('UTF-8', 'UTF-8', invalid: :replace, undef: :replace, replace: '')
       # Need to reset seek point
       @request.body.rewind
-      /refs\/heads\/([\w\.-]+)/.match(input).to_a.last
+      /refs\/heads\/([\w\.-]+)/n.match(input.force_encoding('ascii-8bit')).to_a.last
     end
  
     def project
...	...	@@ -109,11 +109,9 @@ module Grack
109	109	else
110	110	input = @request.body.read
111	111	end
112		- # force utf-8 encoding
113		- input.encode!('UTF-8', 'UTF-8', invalid: :replace, undef: :replace, replace: '')
114	112	# Need to reset seek point
115	113	@request.body.rewind
116		- /refs\/heads\/([\w\.-]+)/.match(input).to_a.last
	114	+ /refs\/heads\/([\w\.-]+)/n.match(input.force_encoding('ascii-8bit')).to_a.last
117	115	end
118	116
119	117	def project
...	...