crystal-lang · Dec 3, 2016 · Dec 3, 2016 · Dec 3, 2016 · Dec 3, 2016
Showing with 163 additions and 82 deletions.

+18 −0 spec/std/http/headers_spec.cr

+2 −2 spec/std/set_spec.cr

+1 −1 src/compiler/crystal/compiler.cr

+15 −6 src/http/headers.cr

+118 −70 src/set.cr

+9 −3 src/slice.cr
diff --git a/spec/std/http/headers_spec.cr b/spec/std/http/headers_spec.cr
@@ -147,6 +147,24 @@ describe HTTP::Headers do
     headers.includes_word?("foo", "ba").should be_false
   end
 
+  it "matches word with comma separated value, case insensitive (#3626)" do
+    headers = HTTP::Headers{"foo" => "BaR, BAZ"}
+    headers.includes_word?("foo", "bar").should be_true
+    headers.includes_word?("foo", "baz").should be_true
+    headers.includes_word?("foo", "BAR").should be_true
+    headers.includes_word?("foo", "ba").should be_false
+  end
+
+  it "doesn't match empty string" do
+    headers = HTTP::Headers{"foo" => "bar, baz"}
+    headers.includes_word?("foo", "").should be_false
+  end
+
+  it "matches word with comma separated value, partial match" do
+    headers = HTTP::Headers{"foo" => "bar, bazo, baz"}
+    headers.includes_word?("foo", "baz").should be_true
+  end
+
   it "matches word among headers" do
     headers = HTTP::Headers.new
     headers.add("foo", "bar")

diff --git a/spec/std/set_spec.cr b/spec/std/set_spec.cr
@@ -104,13 +104,13 @@ describe "Set" do
   describe "merge" do
     it "adds all the other elements" do
       set = Set{1, 4, 8}
-      set.merge [1, 9, 10]
+      set.merge! [1, 9, 10]
       set.should eq(Set{1, 4, 8, 9, 10})
     end
 
     it "returns self" do
       set = Set{1, 4, 8}
-      set.merge([1, 9, 10]).should eq(Set{1, 4, 8, 9, 10})
+      set.merge!([1, 9, 10]).should eq(Set{1, 4, 8, 9, 10})
     end
   end
 

diff --git a/src/compiler/crystal/compiler.cr b/src/compiler/crystal/compiler.cr
@@ -152,7 +152,7 @@ module Crystal
       program.cache_dir = CacheDir.instance.directory_for(sources)
       program.target_machine = target_machine
       program.flags << "release" if @release
-      program.flags.merge @flags
+      program.flags.merge! @flags
       program.wants_doc = wants_doc?
       program.color = color?
       program.stdout = stdout

diff --git a/src/http/headers.cr b/src/http/headers.cr
@@ -79,14 +79,23 @@ struct HTTP::Headers
   # headers.includes_word?("Connection", "Upgrade") # => true
   # ```
   def includes_word?(key, word)
+    return false if word.empty?
+
+    word = word.downcase
     # iterates over all header values avoiding the concatenation
     get?(key).try &.each do |value|
-      start = value.index(word)
-      next unless start
-      # check if the match is not surrounded by alphanumeric chars
-      next if start > 0 && value[start - 1].ascii_alphanumeric?
-      next if start + word.size < value.size && value[start + word.size].alphanumeric?
-      return true
+      value = value.downcase
+      offset = 0
+      while true
+        start = value.index(word, offset)
+        break unless start
+        offset = start + word.size
+
+        # check if the match is not surrounded by alphanumeric chars
+        next if start > 0 && value[start - 1].ascii_alphanumeric?
+        next if start + word.size < value.size && value[start + word.size].ascii_alphanumeric?
+        return true
+      end
     end
 
     false