merge revision(s) 23558:

	* lib/cgi.rb (HTTP_STATUS): typo fixed.   [ruby-dev:38538]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index f50466572c..7da14c9d29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 24 17:19:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (HTTP_STATUS): typo fixed.   [ruby-dev:38538]
+
 Wed Jul 22 23:39:34 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/text.rb (REXML::Text.normalize): call to_s for input.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 5279439a08..5d74aa08ff 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -306,7 +306,7 @@ class CGI
     "METHOD_NOT_ALLOWED"  => "405 Method Not Allowed",
     "NOT_ACCEPTABLE"      => "406 Not Acceptable",
     "LENGTH_REQUIRED"     => "411 Length Required",
-    "PRECONDITION_FAILED" => "412 Rrecondition Failed",
+    "PRECONDITION_FAILED" => "412 Precondition Failed",
     "SERVER_ERROR"        => "500 Internal Server Error",
     "NOT_IMPLEMENTED"     => "501 Method Not Implemented",
     "BAD_GATEWAY"         => "502 Bad Gateway",
diff --git a/version.h b/version.h
index e608829c77..d9f8317148 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-22"
+#define RUBY_RELEASE_DATE "2009-07-24"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090722
-#define RUBY_PATCHLEVEL 188
+#define RUBY_RELEASE_CODE 20090724
+#define RUBY_PATCHLEVEL 189
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];