mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Reduce ambiguity of headers
This commit is contained in:
parent
eeff566886
commit
ad8197e4d6
3 changed files with 37 additions and 2 deletions
|
@ -14,12 +14,14 @@
|
|||
|
||||
/*
|
||||
* capitalizes all lower-case ASCII characters,
|
||||
* converts dashes to underscores.
|
||||
* converts dashes to underscores, and underscores to commas.
|
||||
*/
|
||||
static void snake_upcase_char(char *c)
|
||||
{
|
||||
if (*c >= 'a' && *c <= 'z')
|
||||
*c &= ~0x20;
|
||||
else if (*c == '_')
|
||||
*c = ',';
|
||||
else if (*c == '-')
|
||||
*c = '_';
|
||||
}
|
||||
|
|
|
@ -12,12 +12,14 @@
|
|||
|
||||
/*
|
||||
* capitalizes all lower-case ASCII characters,
|
||||
* converts dashes to underscores.
|
||||
* converts dashes to underscores, and underscores to commas.
|
||||
*/
|
||||
static void snake_upcase_char(char *c)
|
||||
{
|
||||
if (*c >= 'a' && *c <= 'z')
|
||||
*c &= ~0x20;
|
||||
else if (*c == '_')
|
||||
*c = ',';
|
||||
else if (*c == '-')
|
||||
*c = '_';
|
||||
}
|
||||
|
|
|
@ -564,6 +564,37 @@ module Puma
|
|||
}
|
||||
end
|
||||
|
||||
# Fixup any headers with , in the name to have _ now. We emit
|
||||
# headers with , in them during the parse phase to avoid ambiguity
|
||||
# with the - to _ conversion for critical headers. But here for
|
||||
# compatibility, we'll convert them back. This code is written to
|
||||
# avoid allocation in the common case (ie there are no headers
|
||||
# with , in their names), that's why it has the extra conditionals.
|
||||
|
||||
to_delete = nil
|
||||
to_add = nil
|
||||
|
||||
env.each do |k,v|
|
||||
if k.start_with?("HTTP_") and k.include?(",") and k != "HTTP_TRANSFER,ENCODING"
|
||||
if to_delete
|
||||
to_delete << k
|
||||
else
|
||||
to_delete = [k]
|
||||
end
|
||||
|
||||
unless to_add
|
||||
to_add = {}
|
||||
end
|
||||
|
||||
to_add[k.gsub(",", "_")] = v
|
||||
end
|
||||
end
|
||||
|
||||
if to_delete
|
||||
to_delete.each { |k| env.delete(k) }
|
||||
env.merge! to_add
|
||||
end
|
||||
|
||||
# A rack extension. If the app writes #call'ables to this
|
||||
# array, we will invoke them when the request is done.
|
||||
#
|
||||
|
|
Loading…
Add table
Reference in a new issue