aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-02-07 16:18:09 -0600
committerJoshua Peek <josh@joshpeek.com>2009-02-07 16:18:09 -0600
commit524d8edf68ab94315a128cbd7570d1cf4faf7d7a (patch)
tree9216f1a68194be1bc27a9e83de40205e1c419f4e /actionpack/lib/action_controller/vendor/rack-1.0/rack/handler
parent0edb0a4facdf6de8d12a004b59232e1006b93cd9 (diff)
downloadrails-524d8edf68ab94315a128cbd7570d1cf4faf7d7a.tar.gz
rails-524d8edf68ab94315a128cbd7570d1cf4faf7d7a.tar.bz2
rails-524d8edf68ab94315a128cbd7570d1cf4faf7d7a.zip
Update bundled Rack for Ruby 1.9 spec changes
Diffstat (limited to 'actionpack/lib/action_controller/vendor/rack-1.0/rack/handler')
-rw-r--r--actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb2
-rw-r--r--actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb2
-rw-r--r--actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb2
-rw-r--r--actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb2
-rw-r--r--actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb2
-rw-r--r--actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb4
6 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb
index e8bf139da5..f2c976cf46 100644
--- a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb
+++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb
@@ -38,7 +38,7 @@ module Rack
def self.send_headers(status, headers)
STDOUT.print "Status: #{status}\r\n"
headers.each { |k, vs|
- vs.each { |v|
+ vs.split("\n").each { |v|
STDOUT.print "#{k}: #{v}\r\n"
}
}
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb
index 75b94e9943..f03e1615c9 100644
--- a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb
+++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb
@@ -67,7 +67,7 @@ module Rack
def self.send_headers(out, status, headers)
out.print "Status: #{status}\r\n"
headers.each { |k, vs|
- vs.each { |v|
+ vs.split("\n").each { |v|
out.print "#{k}: #{v}\r\n"
}
}
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb
index 265e67c10b..1f850fc77b 100644
--- a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb
+++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb
@@ -34,7 +34,7 @@ module Rack
def self.send_headers(status, headers)
print "Status: #{status}\r\n"
headers.each { |k, vs|
- vs.each { |v|
+ vs.split("\n").each { |v|
print "#{k}: #{v}\r\n"
}
}
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb
index cd906862a5..178a1a8fe4 100644
--- a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb
+++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb
@@ -63,7 +63,7 @@ module Rack
response.send_status(nil)
headers.each { |k, vs|
- vs.each { |v|
+ vs.split("\n").each { |v|
response.header[k] = v
}
}
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb
index 053944091b..fd18a8359b 100644
--- a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb
+++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb
@@ -44,7 +44,7 @@ module Rack
begin
socket.write("Status: #{status}\r\n")
headers.each do |k, vs|
- vs.each {|v| socket.write("#{k}: #{v}\r\n")}
+ vs.split("\n").each { |v| socket.write("#{k}: #{v}\r\n")}
end
socket.write("\r\n")
body.each {|s| socket.write(s)}
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb
index 604f48a288..40be79de13 100644
--- a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb
+++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb
@@ -42,9 +42,9 @@ module Rack
res.status = status.to_i
headers.each { |k, vs|
if k.downcase == "set-cookie"
- res.cookies.concat Array(vs)
+ res.cookies.concat vs.split("\n")
else
- vs.each { |v|
+ vs.split("\n").each { |v|
res[k] = v
}
end