actionpack 2.3.14 → 2.3.15

data/Rakefile

@@ -78,8 +78,8 @@ spec = Gem::Specification.new do |s|
 
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.3.14' + PKG_BUILD)
-  s.add_dependency('rack', '~> 1.1.0')
+  s.add_dependency('activesupport', '= 2.3.15' + PKG_BUILD)
+  s.add_dependency('rack', '~> 1.1.3')
 
   s.require_path = 'lib'
 

data/lib/action_controller.rb

@@ -31,7 +31,7 @@ rescue LoadError
   end
 end
 
-gem 'rack', '~> 1.1.0'
+gem 'rack', '~> 1.1.3'
 require 'rack'
 require 'action_controller/cgi_ext'
 

data/lib/action_controller/request.rb

@@ -225,7 +225,7 @@ module ActionController
         not_trusted_addrs = remote_addr_list.reject {|addr| addr =~ TRUSTED_PROXIES}
         return not_trusted_addrs.first unless not_trusted_addrs.empty?
       end
-      remote_ips = @env['HTTP_X_FORWARDED_FOR'] && @env['HTTP_X_FORWARDED_FOR'].split(',')
+      remote_ips = @env['HTTP_X_FORWARDED_FOR'].present? && @env['HTTP_X_FORWARDED_FOR'].split(',')
 
       if @env.include? 'HTTP_CLIENT_IP'
         if ActionController::Base.ip_spoofing_check && remote_ips && !remote_ips.include?(@env['HTTP_CLIENT_IP'])

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 14
+    TINY  = 15
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/controller/request_test.rb

@@ -20,6 +20,9 @@ class RequestTest < ActiveSupport::TestCase
       'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
     assert_equal '1.2.3.4', request.remote_ip
 
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => ''
+    assert_nil request.remote_ip
+
     request = stub_request 'REMOTE_ADDR' => '127.0.0.1',
       'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
     assert_equal '3.4.5.6', request.remote_ip

data/test/controller/webservice_test.rb

@@ -121,6 +121,19 @@ class WebServiceTest < ActionController::IntegrationTest
     end
   end
 
+  def test_post_xml_using_a_disallowed_type_attribute
+    $stderr = StringIO.new
+    with_test_route_set do
+      post '/', '<foo type="symbol">value</foo>', 'CONTENT_TYPE' => 'application/xml'
+      assert_response 500
+
+      post '/', '<foo type="yaml">value</foo>', 'CONTENT_TYPE' => 'application/xml'
+      assert_response 500
+    end
+  ensure
+    $stderr = STDERR
+  end
+
   def test_register_and_use_yaml
     with_test_route_set do
       ActionController::Base.param_parsers[Mime::YAML] = Proc.new { |d| YAML.load(d) }

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  prerelease: false
   segments: 
   - 2
   - 3
-  - 14
-  version: 2.3.14
+  - 15
+  version: 2.3.15
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,38 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 Z
+date: 2013-01-08 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 2
         - 3
-        - 14
-        version: 2.3.14
+        - 15
+        version: 2.3.15
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id002
 description: Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.
@@ -498,6 +494,7 @@ files:
 - test/template/url_helper_test.rb
 - test/testing_sandbox.rb
 - test/view/test_case_test.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -507,27 +504,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - none
 rubyforge_project: actionpack
-rubygems_version: 1.8.8
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC.