summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http/responses.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a97ebc9658..fd86fdd131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 9 10:03:10 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * lib/net/http/responses.rb: Added 308 status to CODE_TO_OBJ list.
+ [fix GH-961] Patch by @billinghamj
+
Thu Jul 9 09:34:14 2015 Koichi Sasada <ko1@atdot.net>
* vm_core.h (rb_control_frame_t): fix comments (layout index).
diff --git a/lib/net/http/responses.rb b/lib/net/http/responses.rb
index 1454a27a3e..284bfcfe7f 100644
--- a/lib/net/http/responses.rb
+++ b/lib/net/http/responses.rb
@@ -231,6 +231,7 @@ class Net::HTTPResponse
'304' => Net::HTTPNotModified,
'305' => Net::HTTPUseProxy,
'307' => Net::HTTPTemporaryRedirect,
+ '308' => Net::HTTPPermanentRedirect,
'400' => Net::HTTPBadRequest,
'401' => Net::HTTPUnauthorized,