cgi 0.4.2.beta1 → 0.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/cgi/cookie.rb +3 -2
- data/lib/cgi/util.rb +2 -2
- data/lib/cgi.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a2223dc33d62279bcf8cb78f68d8fb46f22c8d9e396243e22d43ded77291dfe5
|
|
4
|
+
data.tar.gz: 70b263423e005129ac529dd41f59324accedd2cf6fd8c260965286ff0f03a399
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9d63be598547392b545cabca27ed6f6765ffa9d8e778335118fa29592c36d8276cc68af052db7abe8e2373c8818072523df6e6aaf65393d09c7c5d16600af6cd
|
|
7
|
+
data.tar.gz: 5a27bb456ab0ecee2e504b737f1b7e8f8e2dd3d56f253fd9c08b5ef42fb145dbc1fbb5e3cec9e98866b19d42aa63d58b4b36affa94a25be9e9f46fa2bc03c942
|
data/lib/cgi/cookie.rb
CHANGED
|
@@ -190,9 +190,10 @@ class CGI
|
|
|
190
190
|
values ||= ""
|
|
191
191
|
values = values.split('&').collect{|v| CGI.unescape(v,@@accept_charset) }
|
|
192
192
|
if cookies.has_key?(name)
|
|
193
|
-
|
|
193
|
+
cookies[name].concat(values)
|
|
194
|
+
else
|
|
195
|
+
cookies[name] = Cookie.new(name, *values)
|
|
194
196
|
end
|
|
195
|
-
cookies[name] = Cookie.new(name, *values)
|
|
196
197
|
end
|
|
197
198
|
|
|
198
199
|
cookies
|
data/lib/cgi/util.rb
CHANGED
|
@@ -184,7 +184,7 @@ module CGI::Util
|
|
|
184
184
|
def escapeElement(string, *elements)
|
|
185
185
|
elements = elements[0] if elements[0].kind_of?(Array)
|
|
186
186
|
unless elements.empty?
|
|
187
|
-
string.gsub(/<\/?(?:#{elements.join("|")})
|
|
187
|
+
string.gsub(/<\/?(?:#{elements.join("|")})\b[^<>]*+>?/im) do
|
|
188
188
|
CGI.escapeHTML($&)
|
|
189
189
|
end
|
|
190
190
|
else
|
|
@@ -204,7 +204,7 @@ module CGI::Util
|
|
|
204
204
|
def unescapeElement(string, *elements)
|
|
205
205
|
elements = elements[0] if elements[0].kind_of?(Array)
|
|
206
206
|
unless elements.empty?
|
|
207
|
-
string.gsub(/<\/?(?:#{elements.join("|")})(
|
|
207
|
+
string.gsub(/<\/?(?:#{elements.join("|")})\b(?>[^&]+|&(?![gl]t;)\w+;)*(?:>)?/im) do
|
|
208
208
|
unescapeHTML($&)
|
|
209
209
|
end
|
|
210
210
|
else
|
data/lib/cgi.rb
CHANGED