actionpack 3.1.5.rc1 → 3.1.5

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Rails 3.1.5 (May 31, 2012) ##
+
+*   Detect optional glob params when adding non-greedy regexp - closes #4817.
+
+*   Strip null bytes from Location header
+
+*   Return the same session data object when setting session id
+
+*   Avoid inspecting the whole route set, closes #1525
+
+*   Strip [nil] from parameters hash.  Thanks to Ben Murphy for reporting this!
+    CVE-2012-2660
+
 ## Rails 3.1.4 (unreleased) ##
 
 *   :subdomain can now be specified with a value of false in url_for, 

data/lib/action_dispatch/http/request.rb

@@ -267,6 +267,28 @@ module ActionDispatch
       LOCALHOST.any? { |local_ip| local_ip === remote_addr && local_ip === remote_ip }
     end
 
+    protected
+
+    # Remove nils from the params hash
+    def deep_munge(hash)
+      hash.each_value do |v|
+        case v
+        when Array
+          v.grep(Hash) { |x| deep_munge(x) }
+        when Hash
+          deep_munge(v)
+        end
+      end
+
+      keys = hash.keys.find_all { |k| hash[k] == [nil] }
+      keys.each { |k| hash[k] = nil }
+      hash
+    end
+
+    def parse_query(qs)
+      deep_munge(super)
+    end
+
     private
 
     def check_method(name)

data/lib/action_pack/version.rb

@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 1
     TINY  = 5
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 4225350523
-  prerelease: 6
+  hash: 9
+  prerelease: 
   segments: 
   - 3
   - 1
   - 5
-  - rc
-  - 1
-  version: 3.1.5.rc1
+  version: 3.1.5
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 Z
+date: 2012-05-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -27,14 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 4225350523
+        hash: 9
         segments: 
         - 3
         - 1
         - 5
-        - rc
-        - 1
-        version: 3.1.5.rc1
+        version: 3.1.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,14 +41,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 4225350523
+        hash: 9
         segments: 
         - 3
         - 1
         - 5
-        - rc
-        - 1
-        version: 3.1.5.rc1
+        version: 3.1.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -416,14 +410,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - none
 rubyforge_project: