diff --git a/ChangeLog b/ChangeLog
index 7d3bea9186..8c44fe9e0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 28 22:44:26 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI::parse): ignore illegal query params.
+	[ruby-dev:36618]
+
 Sun Sep 28 22:05:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* compile.c (iseq_set_sequence): check duplicated when clause.
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index b99f5a1c7d..765a026c2b 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -337,7 +337,9 @@ class CGI
     params = {}
     query.split(/[&;]/).each do |pairs|
       key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
-      params.has_key?(key) ? params[key].push(value) : params[key] = [value]
+      if key && value
+        params.has_key?(key) ? params[key].push(value) : params[key] = [value]
+      end
     end
     params.default=[].freeze
     params