mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Correctly handle single media with q value. Fixes #736.
This commit is contained in:
parent
339c99b62c
commit
3b203f7cb6
1 changed files with 3 additions and 1 deletions
|
@ -82,6 +82,7 @@ module Mime
|
|||
class << self
|
||||
|
||||
TRAILING_STAR_REGEXP = /(text|application)\/\*/
|
||||
Q_SEPARATOR_REGEXP = /;\s*q=/
|
||||
|
||||
def lookup(string)
|
||||
LOOKUP[string]
|
||||
|
@ -108,6 +109,7 @@ module Mime
|
|||
|
||||
def parse(accept_header)
|
||||
if accept_header !~ /,/
|
||||
accept_header = accept_header.split(Q_SEPARATOR_REGEXP).first
|
||||
if accept_header =~ TRAILING_STAR_REGEXP
|
||||
parse_data_with_trailing_star($1)
|
||||
else
|
||||
|
@ -117,7 +119,7 @@ module Mime
|
|||
# keep track of creation order to keep the subsequent sort stable
|
||||
list, index = [], 0
|
||||
accept_header.split(/,/).each do |header|
|
||||
params, q = header.split(/;\s*q=/)
|
||||
params, q = header.split(Q_SEPARATOR_REGEXP)
|
||||
if params.present?
|
||||
params.strip!
|
||||
|
||||
|
|
Loading…
Reference in a new issue