summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8777772ded..dad4324743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 22 11:52:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
+ HTTPInternalServerError should be error 500. [ruby-core:08037]
+
Thu Jun 22 05:15:58 2006 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c (sock_s_socketpair): try GC only once.
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 3f05d81073..43ef6e1ad3 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1962,7 +1962,7 @@ module Net #:nodoc:
'416' => HTTPRequestedRangeNotSatisfiable,
'417' => HTTPExpectationFailed,
- '501' => HTTPInternalServerError,
+ '500' => HTTPInternalServerError,
'501' => HTTPNotImplemented,
'502' => HTTPBadGateway,
'503' => HTTPServiceUnavailable,