From a59a9b7f729870de6c9282bd8e2a7ed7f86fc868 Mon Sep 17 00:00:00 2001
From: Peter Suschlik <ps@neopoly.de>
Date: Thu, 28 Aug 2014 09:09:04 +0200
Subject: Don't rescue IPAddr::InvalidAddressError

IPAddr::InvalidAddressError does not exist in Ruby 1.9.3
and fails for JRuby in 1.9 mode.

As IPAddr::InvalidAddressError is a subclass of ArgumentError
(via IPAddr::Error) just rescuing ArgumentError is fine.
---
 actionpack/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 4e8e0f41b4..e250450a76 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Don't rescue `IPAddr::InvalidAddressError`.
+
+    `IPAddr::InvalidAddressError` does not exist in Ruby 1.9.3
+    and fails for JRuby in 1.9 mode.
+
+    *Peter Suschlik*
+
 *   Fix bug where the router would ignore any constraints added to redirect
     routes.
 
-- 
cgit v1.2.3