diff --git a/ChangeLog b/ChangeLog
index 992689bbf5..060d78d56a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 25 17:12:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
+	  discard if key=val pair is empty. patch from Gary Wright.
+
 Sat Jun 25 15:49:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enum.c (enum_min, enum_max, enum_min_by, enum_max_by): do not ignore
@@ -79,7 +84,7 @@ Mon Jun 20 01:26:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/openssl_missing.c, ext/openssl/ossl.h,
 	  ext/openssl/ossl_asn1.c, ext/openssl/ossl_bio.c,
 	  ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
-	  compiler warnings. suggested by Mical Rokos.
+	  compiler warnings. suggested by Michal Rokos.
 
 Sun Jun 19 17:22:02 CEST 2005  Michael Neumann  <mneumann@ruby-lang.org>
 
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index 67bc281c5d..2a65552f20 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -294,6 +294,7 @@ module WEBrick
       query = Hash.new
       if str
         str.split(/[&;]/).each{|x|
+          next if x.empty?
           key, val = x.split(/=/,2)
           key = unescape_form(key)
           val = unescape_form(val.to_s)