From 9a6b18463bb92a16ab36a00f888b49f5360a6d28 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Sun, 14 Apr 2013 13:29:08 +0900 Subject: [PATCH] scan_name never returns nil because RE_NAME matches an empty string. --- lib/http/cookie/scanner.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/http/cookie/scanner.rb b/lib/http/cookie/scanner.rb index 05d8455..ff04047 100644 --- a/lib/http/cookie/scanner.rb +++ b/lib/http/cookie/scanner.rb @@ -166,9 +166,7 @@ class HTTP::Cookie::Scanner < StringScanner skip_wsp name, value = scan_name_value - if name.nil? - break - elsif value.nil? + if value.nil? @logger.warn("Cookie definition lacks a name-value pair.") if @logger elsif name.empty? @logger.warn("Cookie definition has an empty name.") if @logger @@ -185,7 +183,6 @@ class HTTP::Cookie::Scanner < StringScanner when skip(/;/) skip_wsp aname, avalue = scan_name_value - break if aname.nil? next if aname.empty? || value.nil? aname.downcase! case aname @@ -236,7 +233,7 @@ class HTTP::Cookie::Scanner < StringScanner name, value = scan_name_value - yield name, value if name && value + yield name, value if value # The comma is used as separator for concatenating multiple # values of a header.