rpms/rubygem-actionpack/devel rubygem-actionpack-2.3.5-rack-compat.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 rubygem-actionpack.spec, 1.15, 1.16 sources, 1.10, 1.11 rubygem-actionpack-2.3.4-rack-compat.patch, 1.1, NONE rubygem-actionpack-2.3.x-CVE-2009-4214.patch, 1.1, NONE

Mamoru Tasaka mtasaka at fedoraproject.org
Wed Feb 3 19:30:22 UTC 2010 

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5811/rubygem-actionpack/devel

Modified Files:
	.cvsignore rubygem-actionpack.spec sources 
Added Files:
	rubygem-actionpack-2.3.5-rack-compat.patch 
Removed Files:
	rubygem-actionpack-2.3.4-rack-compat.patch 
	rubygem-actionpack-2.3.x-CVE-2009-4214.patch 
Log Message:
update rawhide rails to 2.3.5

rubygem-actionpack-2.3.5-rack-compat.patch:
 Rakefile                                     |    2 +-
 lib/action_controller.rb                     |    2 +-
 lib/action_controller/integration.rb         |   22 +++++++++++++++++++---
 lib/action_controller/response.rb            |   13 +++++++++++++
 test/controller/integration_test.rb          |    4 +++-
 test/controller/rack_test.rb                 |   21 ++++++++++++++++++---
 test/controller/session/cookie_store_test.rb |    6 ++++--
 7 files changed, 59 insertions(+), 11 deletions(-)

--- NEW FILE rubygem-actionpack-2.3.5-rack-compat.patch ---
--- Rakefile.debug	2010-01-07 03:03:57.000000000 +0900
+++ Rakefile	2010-01-28 00:43:00.000000000 +0900
@@ -80,7 +80,7 @@
   s.requirements << 'none'
 
   s.add_dependency('activesupport', '= 2.3.5' + PKG_BUILD)
-  s.add_dependency('rack', '~> 1.0.0')
+  s.add_dependency('rack', '>= 1.0.0')
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
--- lib/action_controller.rb.debug	2010-01-07 03:03:57.000000000 +0900
+++ lib/action_controller.rb	2010-01-28 00:43:00.000000000 +0900
@@ -31,7 +31,7 @@
   end
 end
 
-gem 'rack', '~> 1.0.1'
+gem 'rack', '>= 1.0.1'
 require 'rack'
 require 'action_controller/cgi_ext'
 
--- lib/action_controller/integration.rb.debug	2010-01-07 03:03:57.000000000 +0900
+++ lib/action_controller/integration.rb	2010-01-07 18:46:03.000000000 +0900
@@ -320,9 +320,25 @@
 
           @headers = Rack::Utils::HeaderHash.new(headers)
 
-          (@headers['Set-Cookie'] || "").split("\n").each do |cookie|
-            name, value = cookie.match(/^([^=]*)=([^;]*);/)[1,2]
-            @cookies[name] = value
+          # Umm.. it seems that with rack 1.1.0 @headers is an array
+          # instead of a string which rack 1.0.0 returned
+          # FIXME!!
+
+          headers_cookie = @headers['Set-Cookie']
+          if headers_cookie.is_a?(Array)
+              headers_cookie.each do |cookie_arr|
+                cookie_arr.split("\n").each do |cookie|
+                  name, value = cookie.match(/^([^=]*)=([^;]*);/)[1,2]
+                  @cookies[name] = value
+                end
+              end
+
+          else
+
+            (headers_cookie || "").split("\n").each do |cookie|
+              name, value = cookie.match(/^([^=]*)=([^;]*);/)[1,2]
+              @cookies[name] = value
+            end
           end
 
           @body = ""
--- lib/action_controller/response.rb.debug	2010-01-07 03:03:57.000000000 +0900
+++ lib/action_controller/response.rb	2010-01-07 19:40:44.000000000 +0900
@@ -112,6 +112,12 @@
     end
 
     def etag?
+
+      # FIXME!!
+      if Rack::VERSION[0] == 1 && Rack::VERSION[1] >= 1
+        return headers.include?('ETag') && !headers['ETag'].nil?
+      end
+
       headers.include?('ETag')
     end
 
@@ -218,8 +224,15 @@
       # Don't set the Content-Length for block-based bodies as that would mean
       # reading it all into memory. Not nice for, say, a 2GB streaming file.
       def set_content_length!
+
+        ## FIXME
+
         if status && status.to_s[0..2] == '204'
           headers.delete('Content-Length')
+
+        elsif Rack::VERSION[0] == 1 && Rack::VERSION[1] >= 1 && status && status.to_s[0..2] == '304'
+          headers.delete('Content-Length')
+
         elsif length = headers['Content-Length']
           headers['Content-Length'] = length.to_s
         elsif !body.respond_to?(:call) && (!status || status.to_s[0..2] != '304')
--- test/controller/integration_test.rb.debug	2010-01-07 03:03:57.000000000 +0900
+++ test/controller/integration_test.rb	2010-01-07 05:44:37.000000000 +0900
@@ -306,7 +306,9 @@
       assert_equal "Gone", status_message
       assert_response 410
       assert_response :gone
-      assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"]
+      # Okay if cookies coincides.
+      # With rake 1.1.0 headers["Set-Cookie"] is an array instread of a string
+      #assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"]
       assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies)
       assert_equal "Gone", response.body
     end
--- test/controller/rack_test.rb.debug	2010-01-07 03:03:57.000000000 +0900
+++ test/controller/rack_test.rb	2010-01-07 05:40:49.000000000 +0900
@@ -215,11 +215,16 @@
 
     status, headers, body = @response.to_a
     assert_equal 200, status
+    if headers['Set-Cookie'].is_a?(Array)
+      cookie_must = []
+    else
+      cookie_must = ""
+    end
     assert_equal({
       "Content-Type" => "text/html; charset=utf-8",
       "Cache-Control" => "private, max-age=0, must-revalidate",
       "ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"',
-      "Set-Cookie" => "",
+      "Set-Cookie" => cookie_must,
       "Content-Length" => "13"
     }, headers)
 
@@ -234,11 +239,16 @@
 
     status, headers, body = @response.to_a
     assert_equal 200, status
+    if headers['Set-Cookie'].is_a?(Array)
+      cookie_must = []
+    else
+      cookie_must = ""
+    end
     assert_equal({
       "Content-Type" => "text/html; charset=utf-8",
       "Cache-Control" => "private, max-age=0, must-revalidate",
       "ETag" => '"ebb5e89e8a94e9dd22abf5d915d112b2"',
-      "Set-Cookie" => "",
+      "Set-Cookie" => cookie_must,
       "Content-Length" => "8"
     }, headers)
   end
@@ -251,10 +261,15 @@
 
     status, headers, body = @response.to_a
     assert_equal 200, status
+    if headers['Set-Cookie'].is_a?(Array)
+      cookie_must = []
+    else
+      cookie_must = ""
+    end
     assert_equal({
       "Content-Type" => "text/html; charset=utf-8",
       "Cache-Control" => "no-cache",
-      "Set-Cookie" => ""
+      "Set-Cookie" => cookie_must
     }, headers)
 
     parts = []
--- test/controller/session/cookie_store_test.rb.debug	2010-01-07 03:03:57.000000000 +0900
+++ test/controller/session/cookie_store_test.rb	2010-01-07 05:47:37.000000000 +0900
@@ -145,7 +145,8 @@
     with_test_route_set do
       get '/no_session_access'
       assert_response :success
-      assert_equal "", headers['Set-Cookie']
+      #assert_equal "", headers['Set-Cookie']
+      assert headers['Set-Cookie'].empty?
     end
   end
 
@@ -155,7 +156,8 @@
         "fef868465920f415f2c0652d6910d3af288a0367"
       get '/no_session_access'
       assert_response :success
-      assert_equal "", headers['Set-Cookie']
+      #assert_equal "", headers['Set-Cookie']
+      assert headers['Set-Cookie'].empty?
     end
   end
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	20 Sep 2009 16:40:24 -0000	1.10
+++ .cvsignore	3 Feb 2010 19:30:22 -0000	1.11
@@ -1 +1 @@
-actionpack-2.3.4.gem
+actionpack-2.3.5.gem


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/rubygem-actionpack.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rubygem-actionpack.spec	7 Jan 2010 15:02:11 -0000	1.15
+++ rubygem-actionpack.spec	3 Feb 2010 19:30:22 -0000	1.16
@@ -9,18 +9,17 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Epoch: 1
-Version: 2.3.4
-Release: 4%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 Patch0:  rubygem-actionpack-2.3.4-enable-test.patch
-Patch1:  rubygem-actionpack-2.3.x-CVE-2009-4214.patch
 #
 # Please someone fix the following Patch2!! (mtasaka)
 #
-Patch2:  rubygem-actionpack-2.3.4-rack-compat.patch
+Patch2:  rubygem-actionpack-2.3.5-rack-compat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
@@ -54,7 +53,6 @@ sed -i -e '/rack/s|~>|>=|' \
 
 pushd .%{geminstdir}
 %patch0 -p0
-%patch1 -p2
 %patch2 -p0
 
 # create missing symlink
@@ -121,6 +119,9 @@ rake test --trace
 
 
 %changelog
+* Thu Jan 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:2.3.5-1
+- Update to 2.3.5
+
 * Fri Jan  8 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:2.3.4-4
 - Workaround patch to fix for rack 1.1.0 dependency (bug 552972)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 Sep 2009 16:40:24 -0000	1.10
+++ sources	3 Feb 2010 19:30:22 -0000	1.11
@@ -1 +1 @@
-da53635065d9083ec37be4a36763af9c  actionpack-2.3.4.gem
+c32297f6e4af8ac9971dbc116e98a636  actionpack-2.3.5.gem


--- rubygem-actionpack-2.3.4-rack-compat.patch DELETED ---


--- rubygem-actionpack-2.3.x-CVE-2009-4214.patch DELETED ---

More information about the scm-commits mailing list