actionpack 2.3.2 → 2.3.3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of actionpack might be problematic. Click here for more details.
- data/CHANGELOG +5 -0
- data/Rakefile +10 -9
- data/lib/action_controller.rb +2 -7
- data/lib/action_controller/assertions/response_assertions.rb +11 -3
- data/lib/action_controller/base.rb +7 -2
- data/lib/action_controller/caching.rb +1 -1
- data/lib/action_controller/caching/actions.rb +9 -1
- data/lib/action_controller/caching/sweeper.rb +45 -0
- data/lib/action_controller/caching/sweeping.rb +0 -42
- data/lib/action_controller/failsafe.rb +40 -6
- data/lib/action_controller/flash.rb +11 -3
- data/lib/action_controller/http_authentication.rb +5 -2
- data/lib/action_controller/integration.rb +5 -12
- data/lib/action_controller/middlewares.rb +0 -1
- data/lib/action_controller/reloader.rb +34 -3
- data/lib/action_controller/request.rb +6 -2
- data/lib/action_controller/response.rb +2 -2
- data/lib/action_controller/routing/route_set.rb +2 -1
- data/lib/action_controller/streaming.rb +1 -1
- data/lib/action_controller/test_process.rb +9 -1
- data/lib/action_pack/version.rb +1 -1
- data/lib/action_view/helpers.rb +1 -1
- data/lib/action_view/helpers/asset_tag_helper.rb +21 -9
- data/lib/action_view/helpers/date_helper.rb +2 -2
- data/lib/action_view/helpers/form_helper.rb +25 -12
- data/lib/action_view/helpers/form_options_helper.rb +2 -0
- data/lib/action_view/helpers/form_tag_helper.rb +10 -4
- data/lib/action_view/helpers/number_helper.rb +1 -1
- data/lib/action_view/helpers/prototype_helper.rb +7 -7
- data/lib/action_view/helpers/scriptaculous_helper.rb +5 -5
- data/lib/action_view/helpers/text_helper.rb +3 -3
- data/lib/action_view/helpers/url_helper.rb +1 -1
- data/lib/action_view/paths.rb +1 -1
- data/lib/action_view/template.rb +22 -33
- data/test/abstract_unit.rb +1 -1
- data/test/activerecord/active_record_store_test.rb +3 -3
- data/test/controller/action_pack_assertions_test.rb +27 -0
- data/test/controller/caching_test.rb +39 -0
- data/test/controller/cookie_test.rb +10 -0
- data/test/controller/dispatcher_test.rb +9 -7
- data/test/controller/failsafe_test.rb +60 -0
- data/test/controller/filter_params_test.rb +2 -1
- data/test/controller/flash_test.rb +6 -1
- data/test/controller/http_digest_authentication_test.rb +34 -3
- data/test/controller/integration_test.rb +31 -3
- data/test/controller/redirect_test.rb +4 -1
- data/test/controller/reloader_test.rb +97 -0
- data/test/controller/render_test.rb +19 -9
- data/test/controller/request/multipart_params_parsing_test.rb +1 -62
- data/test/controller/request/test_request_test.rb +35 -0
- data/test/controller/request/url_encoded_params_parsing_test.rb +0 -38
- data/test/controller/request_test.rb +218 -230
- data/test/controller/resources_test.rb +8 -0
- data/test/controller/routing_test.rb +21 -0
- data/test/controller/send_file_test.rb +1 -1
- data/test/controller/session/cookie_store_test.rb +9 -32
- data/test/controller/test_test.rb +8 -0
- data/test/fixtures/failsafe/500.html +1 -0
- data/test/template/active_record_helper_test.rb +1 -1
- data/test/template/asset_tag_helper_test.rb +46 -0
- data/test/template/form_helper_test.rb +117 -6
- data/test/template/form_options_helper_test.rb +22 -0
- data/test/template/form_tag_helper_test.rb +23 -6
- data/test/template/prototype_helper_test.rb +11 -11
- data/test/template/template_test.rb +32 -0
- metadata +20 -63
- data/lib/action_controller/rewindable_input.rb +0 -28
- data/lib/action_controller/vendor/rack-1.0/rack.rb +0 -89
- data/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb +0 -22
- data/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb +0 -37
- data/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb +0 -37
- data/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb +0 -58
- data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb +0 -124
- data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb +0 -51
- data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb +0 -55
- data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb +0 -40
- data/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb +0 -480
- data/lib/action_controller/vendor/rack-1.0/rack/builder.rb +0 -63
- data/lib/action_controller/vendor/rack-1.0/rack/cascade.rb +0 -36
- data/lib/action_controller/vendor/rack-1.0/rack/chunked.rb +0 -49
- data/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb +0 -61
- data/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb +0 -45
- data/lib/action_controller/vendor/rack-1.0/rack/content_length.rb +0 -29
- data/lib/action_controller/vendor/rack-1.0/rack/content_type.rb +0 -23
- data/lib/action_controller/vendor/rack-1.0/rack/deflater.rb +0 -85
- data/lib/action_controller/vendor/rack-1.0/rack/directory.rb +0 -153
- data/lib/action_controller/vendor/rack-1.0/rack/file.rb +0 -88
- data/lib/action_controller/vendor/rack-1.0/rack/handler.rb +0 -48
- data/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb +0 -61
- data/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb +0 -8
- data/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb +0 -89
- data/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb +0 -55
- data/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb +0 -84
- data/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb +0 -59
- data/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb +0 -8
- data/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb +0 -18
- data/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb +0 -67
- data/lib/action_controller/vendor/rack-1.0/rack/head.rb +0 -19
- data/lib/action_controller/vendor/rack-1.0/rack/lint.rb +0 -462
- data/lib/action_controller/vendor/rack-1.0/rack/lobster.rb +0 -65
- data/lib/action_controller/vendor/rack-1.0/rack/lock.rb +0 -16
- data/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb +0 -27
- data/lib/action_controller/vendor/rack-1.0/rack/mime.rb +0 -204
- data/lib/action_controller/vendor/rack-1.0/rack/mock.rb +0 -160
- data/lib/action_controller/vendor/rack-1.0/rack/recursive.rb +0 -57
- data/lib/action_controller/vendor/rack-1.0/rack/reloader.rb +0 -64
- data/lib/action_controller/vendor/rack-1.0/rack/request.rb +0 -241
- data/lib/action_controller/vendor/rack-1.0/rack/response.rb +0 -179
- data/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb +0 -142
- data/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb +0 -91
- data/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb +0 -109
- data/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb +0 -100
- data/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb +0 -349
- data/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb +0 -106
- data/lib/action_controller/vendor/rack-1.0/rack/static.rb +0 -38
- data/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb +0 -55
- data/lib/action_controller/vendor/rack-1.0/rack/utils.rb +0 -392
@@ -1,88 +0,0 @@
|
|
1
|
-
require 'time'
|
2
|
-
require 'rack/utils'
|
3
|
-
require 'rack/mime'
|
4
|
-
|
5
|
-
module Rack
|
6
|
-
# Rack::File serves files below the +root+ given, according to the
|
7
|
-
# path info of the Rack request.
|
8
|
-
#
|
9
|
-
# Handlers can detect if bodies are a Rack::File, and use mechanisms
|
10
|
-
# like sendfile on the +path+.
|
11
|
-
|
12
|
-
class File
|
13
|
-
attr_accessor :root
|
14
|
-
attr_accessor :path
|
15
|
-
|
16
|
-
alias :to_path :path
|
17
|
-
|
18
|
-
def initialize(root)
|
19
|
-
@root = root
|
20
|
-
end
|
21
|
-
|
22
|
-
def call(env)
|
23
|
-
dup._call(env)
|
24
|
-
end
|
25
|
-
|
26
|
-
F = ::File
|
27
|
-
|
28
|
-
def _call(env)
|
29
|
-
@path_info = Utils.unescape(env["PATH_INFO"])
|
30
|
-
return forbidden if @path_info.include? ".."
|
31
|
-
|
32
|
-
@path = F.join(@root, @path_info)
|
33
|
-
|
34
|
-
begin
|
35
|
-
if F.file?(@path) && F.readable?(@path)
|
36
|
-
serving
|
37
|
-
else
|
38
|
-
raise Errno::EPERM
|
39
|
-
end
|
40
|
-
rescue SystemCallError
|
41
|
-
not_found
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
def forbidden
|
46
|
-
body = "Forbidden\n"
|
47
|
-
[403, {"Content-Type" => "text/plain",
|
48
|
-
"Content-Length" => body.size.to_s},
|
49
|
-
[body]]
|
50
|
-
end
|
51
|
-
|
52
|
-
# NOTE:
|
53
|
-
# We check via File::size? whether this file provides size info
|
54
|
-
# via stat (e.g. /proc files often don't), otherwise we have to
|
55
|
-
# figure it out by reading the whole file into memory. And while
|
56
|
-
# we're at it we also use this as body then.
|
57
|
-
|
58
|
-
def serving
|
59
|
-
if size = F.size?(@path)
|
60
|
-
body = self
|
61
|
-
else
|
62
|
-
body = [F.read(@path)]
|
63
|
-
size = Utils.bytesize(body.first)
|
64
|
-
end
|
65
|
-
|
66
|
-
[200, {
|
67
|
-
"Last-Modified" => F.mtime(@path).httpdate,
|
68
|
-
"Content-Type" => Mime.mime_type(F.extname(@path), 'text/plain'),
|
69
|
-
"Content-Length" => size.to_s
|
70
|
-
}, body]
|
71
|
-
end
|
72
|
-
|
73
|
-
def not_found
|
74
|
-
body = "File not found: #{@path_info}\n"
|
75
|
-
[404, {"Content-Type" => "text/plain",
|
76
|
-
"Content-Length" => body.size.to_s},
|
77
|
-
[body]]
|
78
|
-
end
|
79
|
-
|
80
|
-
def each
|
81
|
-
F.open(@path, "rb") { |file|
|
82
|
-
while part = file.read(8192)
|
83
|
-
yield part
|
84
|
-
end
|
85
|
-
}
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
@@ -1,48 +0,0 @@
|
|
1
|
-
module Rack
|
2
|
-
# *Handlers* connect web servers with Rack.
|
3
|
-
#
|
4
|
-
# Rack includes Handlers for Mongrel, WEBrick, FastCGI, CGI, SCGI
|
5
|
-
# and LiteSpeed.
|
6
|
-
#
|
7
|
-
# Handlers usually are activated by calling <tt>MyHandler.run(myapp)</tt>.
|
8
|
-
# A second optional hash can be passed to include server-specific
|
9
|
-
# configuration.
|
10
|
-
module Handler
|
11
|
-
def self.get(server)
|
12
|
-
return unless server
|
13
|
-
|
14
|
-
if klass = @handlers[server]
|
15
|
-
obj = Object
|
16
|
-
klass.split("::").each { |x| obj = obj.const_get(x) }
|
17
|
-
obj
|
18
|
-
else
|
19
|
-
Rack::Handler.const_get(server.capitalize)
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
def self.register(server, klass)
|
24
|
-
@handlers ||= {}
|
25
|
-
@handlers[server] = klass
|
26
|
-
end
|
27
|
-
|
28
|
-
autoload :CGI, "rack/handler/cgi"
|
29
|
-
autoload :FastCGI, "rack/handler/fastcgi"
|
30
|
-
autoload :Mongrel, "rack/handler/mongrel"
|
31
|
-
autoload :EventedMongrel, "rack/handler/evented_mongrel"
|
32
|
-
autoload :SwiftipliedMongrel, "rack/handler/swiftiplied_mongrel"
|
33
|
-
autoload :WEBrick, "rack/handler/webrick"
|
34
|
-
autoload :LSWS, "rack/handler/lsws"
|
35
|
-
autoload :SCGI, "rack/handler/scgi"
|
36
|
-
autoload :Thin, "rack/handler/thin"
|
37
|
-
|
38
|
-
register 'cgi', 'Rack::Handler::CGI'
|
39
|
-
register 'fastcgi', 'Rack::Handler::FastCGI'
|
40
|
-
register 'mongrel', 'Rack::Handler::Mongrel'
|
41
|
-
register 'emongrel', 'Rack::Handler::EventedMongrel'
|
42
|
-
register 'smongrel', 'Rack::Handler::SwiftipliedMongrel'
|
43
|
-
register 'webrick', 'Rack::Handler::WEBrick'
|
44
|
-
register 'lsws', 'Rack::Handler::LSWS'
|
45
|
-
register 'scgi', 'Rack::Handler::SCGI'
|
46
|
-
register 'thin', 'Rack::Handler::Thin'
|
47
|
-
end
|
48
|
-
end
|
@@ -1,61 +0,0 @@
|
|
1
|
-
require 'rack/content_length'
|
2
|
-
|
3
|
-
module Rack
|
4
|
-
module Handler
|
5
|
-
class CGI
|
6
|
-
def self.run(app, options=nil)
|
7
|
-
serve app
|
8
|
-
end
|
9
|
-
|
10
|
-
def self.serve(app)
|
11
|
-
app = ContentLength.new(app)
|
12
|
-
|
13
|
-
env = ENV.to_hash
|
14
|
-
env.delete "HTTP_CONTENT_LENGTH"
|
15
|
-
|
16
|
-
env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
|
17
|
-
|
18
|
-
env.update({"rack.version" => [0,1],
|
19
|
-
"rack.input" => $stdin,
|
20
|
-
"rack.errors" => $stderr,
|
21
|
-
|
22
|
-
"rack.multithread" => false,
|
23
|
-
"rack.multiprocess" => true,
|
24
|
-
"rack.run_once" => true,
|
25
|
-
|
26
|
-
"rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
|
27
|
-
})
|
28
|
-
|
29
|
-
env["QUERY_STRING"] ||= ""
|
30
|
-
env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
|
31
|
-
env["REQUEST_PATH"] ||= "/"
|
32
|
-
|
33
|
-
status, headers, body = app.call(env)
|
34
|
-
begin
|
35
|
-
send_headers status, headers
|
36
|
-
send_body body
|
37
|
-
ensure
|
38
|
-
body.close if body.respond_to? :close
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
def self.send_headers(status, headers)
|
43
|
-
STDOUT.print "Status: #{status}\r\n"
|
44
|
-
headers.each { |k, vs|
|
45
|
-
vs.split("\n").each { |v|
|
46
|
-
STDOUT.print "#{k}: #{v}\r\n"
|
47
|
-
}
|
48
|
-
}
|
49
|
-
STDOUT.print "\r\n"
|
50
|
-
STDOUT.flush
|
51
|
-
end
|
52
|
-
|
53
|
-
def self.send_body(body)
|
54
|
-
body.each { |part|
|
55
|
-
STDOUT.print part
|
56
|
-
STDOUT.flush
|
57
|
-
}
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
61
|
-
end
|
@@ -1,89 +0,0 @@
|
|
1
|
-
require 'fcgi'
|
2
|
-
require 'socket'
|
3
|
-
require 'rack/content_length'
|
4
|
-
|
5
|
-
module Rack
|
6
|
-
module Handler
|
7
|
-
class FastCGI
|
8
|
-
def self.run(app, options={})
|
9
|
-
file = options[:File] and STDIN.reopen(UNIXServer.new(file))
|
10
|
-
port = options[:Port] and STDIN.reopen(TCPServer.new(port))
|
11
|
-
FCGI.each { |request|
|
12
|
-
serve request, app
|
13
|
-
}
|
14
|
-
end
|
15
|
-
|
16
|
-
module ProperStream # :nodoc:
|
17
|
-
def each # This is missing by default.
|
18
|
-
while line = gets
|
19
|
-
yield line
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
def read(*args)
|
24
|
-
if args.empty?
|
25
|
-
super || "" # Empty string on EOF.
|
26
|
-
else
|
27
|
-
super
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
def self.serve(request, app)
|
33
|
-
app = Rack::ContentLength.new(app)
|
34
|
-
|
35
|
-
env = request.env
|
36
|
-
env.delete "HTTP_CONTENT_LENGTH"
|
37
|
-
|
38
|
-
request.in.extend ProperStream
|
39
|
-
|
40
|
-
env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
|
41
|
-
|
42
|
-
env.update({"rack.version" => [0,1],
|
43
|
-
"rack.input" => request.in,
|
44
|
-
"rack.errors" => request.err,
|
45
|
-
|
46
|
-
"rack.multithread" => false,
|
47
|
-
"rack.multiprocess" => true,
|
48
|
-
"rack.run_once" => false,
|
49
|
-
|
50
|
-
"rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
|
51
|
-
})
|
52
|
-
|
53
|
-
env["QUERY_STRING"] ||= ""
|
54
|
-
env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
|
55
|
-
env["REQUEST_PATH"] ||= "/"
|
56
|
-
env.delete "PATH_INFO" if env["PATH_INFO"] == ""
|
57
|
-
env.delete "CONTENT_TYPE" if env["CONTENT_TYPE"] == ""
|
58
|
-
env.delete "CONTENT_LENGTH" if env["CONTENT_LENGTH"] == ""
|
59
|
-
|
60
|
-
status, headers, body = app.call(env)
|
61
|
-
begin
|
62
|
-
send_headers request.out, status, headers
|
63
|
-
send_body request.out, body
|
64
|
-
ensure
|
65
|
-
body.close if body.respond_to? :close
|
66
|
-
request.finish
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
def self.send_headers(out, status, headers)
|
71
|
-
out.print "Status: #{status}\r\n"
|
72
|
-
headers.each { |k, vs|
|
73
|
-
vs.split("\n").each { |v|
|
74
|
-
out.print "#{k}: #{v}\r\n"
|
75
|
-
}
|
76
|
-
}
|
77
|
-
out.print "\r\n"
|
78
|
-
out.flush
|
79
|
-
end
|
80
|
-
|
81
|
-
def self.send_body(out, body)
|
82
|
-
body.each { |part|
|
83
|
-
out.print part
|
84
|
-
out.flush
|
85
|
-
}
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
89
|
-
end
|
@@ -1,55 +0,0 @@
|
|
1
|
-
require 'lsapi'
|
2
|
-
require 'rack/content_length'
|
3
|
-
|
4
|
-
module Rack
|
5
|
-
module Handler
|
6
|
-
class LSWS
|
7
|
-
def self.run(app, options=nil)
|
8
|
-
while LSAPI.accept != nil
|
9
|
-
serve app
|
10
|
-
end
|
11
|
-
end
|
12
|
-
def self.serve(app)
|
13
|
-
app = Rack::ContentLength.new(app)
|
14
|
-
|
15
|
-
env = ENV.to_hash
|
16
|
-
env.delete "HTTP_CONTENT_LENGTH"
|
17
|
-
env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
|
18
|
-
env.update({"rack.version" => [0,1],
|
19
|
-
"rack.input" => StringIO.new($stdin.read.to_s),
|
20
|
-
"rack.errors" => $stderr,
|
21
|
-
"rack.multithread" => false,
|
22
|
-
"rack.multiprocess" => true,
|
23
|
-
"rack.run_once" => false,
|
24
|
-
"rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
|
25
|
-
})
|
26
|
-
env["QUERY_STRING"] ||= ""
|
27
|
-
env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
|
28
|
-
env["REQUEST_PATH"] ||= "/"
|
29
|
-
status, headers, body = app.call(env)
|
30
|
-
begin
|
31
|
-
send_headers status, headers
|
32
|
-
send_body body
|
33
|
-
ensure
|
34
|
-
body.close if body.respond_to? :close
|
35
|
-
end
|
36
|
-
end
|
37
|
-
def self.send_headers(status, headers)
|
38
|
-
print "Status: #{status}\r\n"
|
39
|
-
headers.each { |k, vs|
|
40
|
-
vs.split("\n").each { |v|
|
41
|
-
print "#{k}: #{v}\r\n"
|
42
|
-
}
|
43
|
-
}
|
44
|
-
print "\r\n"
|
45
|
-
STDOUT.flush
|
46
|
-
end
|
47
|
-
def self.send_body(body)
|
48
|
-
body.each { |part|
|
49
|
-
print part
|
50
|
-
STDOUT.flush
|
51
|
-
}
|
52
|
-
end
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
@@ -1,84 +0,0 @@
|
|
1
|
-
require 'mongrel'
|
2
|
-
require 'stringio'
|
3
|
-
require 'rack/content_length'
|
4
|
-
require 'rack/chunked'
|
5
|
-
|
6
|
-
module Rack
|
7
|
-
module Handler
|
8
|
-
class Mongrel < ::Mongrel::HttpHandler
|
9
|
-
def self.run(app, options={})
|
10
|
-
server = ::Mongrel::HttpServer.new(options[:Host] || '0.0.0.0',
|
11
|
-
options[:Port] || 8080)
|
12
|
-
# Acts like Rack::URLMap, utilizing Mongrel's own path finding methods.
|
13
|
-
# Use is similar to #run, replacing the app argument with a hash of
|
14
|
-
# { path=>app, ... } or an instance of Rack::URLMap.
|
15
|
-
if options[:map]
|
16
|
-
if app.is_a? Hash
|
17
|
-
app.each do |path, appl|
|
18
|
-
path = '/'+path unless path[0] == ?/
|
19
|
-
server.register(path, Rack::Handler::Mongrel.new(appl))
|
20
|
-
end
|
21
|
-
elsif app.is_a? URLMap
|
22
|
-
app.instance_variable_get(:@mapping).each do |(host, path, appl)|
|
23
|
-
next if !host.nil? && !options[:Host].nil? && options[:Host] != host
|
24
|
-
path = '/'+path unless path[0] == ?/
|
25
|
-
server.register(path, Rack::Handler::Mongrel.new(appl))
|
26
|
-
end
|
27
|
-
else
|
28
|
-
raise ArgumentError, "first argument should be a Hash or URLMap"
|
29
|
-
end
|
30
|
-
else
|
31
|
-
server.register('/', Rack::Handler::Mongrel.new(app))
|
32
|
-
end
|
33
|
-
yield server if block_given?
|
34
|
-
server.run.join
|
35
|
-
end
|
36
|
-
|
37
|
-
def initialize(app)
|
38
|
-
@app = Rack::Chunked.new(Rack::ContentLength.new(app))
|
39
|
-
end
|
40
|
-
|
41
|
-
def process(request, response)
|
42
|
-
env = {}.replace(request.params)
|
43
|
-
env.delete "HTTP_CONTENT_TYPE"
|
44
|
-
env.delete "HTTP_CONTENT_LENGTH"
|
45
|
-
|
46
|
-
env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
|
47
|
-
|
48
|
-
env.update({"rack.version" => [0,1],
|
49
|
-
"rack.input" => request.body || StringIO.new(""),
|
50
|
-
"rack.errors" => $stderr,
|
51
|
-
|
52
|
-
"rack.multithread" => true,
|
53
|
-
"rack.multiprocess" => false, # ???
|
54
|
-
"rack.run_once" => false,
|
55
|
-
|
56
|
-
"rack.url_scheme" => "http",
|
57
|
-
})
|
58
|
-
env["QUERY_STRING"] ||= ""
|
59
|
-
env.delete "PATH_INFO" if env["PATH_INFO"] == ""
|
60
|
-
|
61
|
-
status, headers, body = @app.call(env)
|
62
|
-
|
63
|
-
begin
|
64
|
-
response.status = status.to_i
|
65
|
-
response.send_status(nil)
|
66
|
-
|
67
|
-
headers.each { |k, vs|
|
68
|
-
vs.split("\n").each { |v|
|
69
|
-
response.header[k] = v
|
70
|
-
}
|
71
|
-
}
|
72
|
-
response.send_header
|
73
|
-
|
74
|
-
body.each { |part|
|
75
|
-
response.write part
|
76
|
-
response.socket.flush
|
77
|
-
}
|
78
|
-
ensure
|
79
|
-
body.close if body.respond_to? :close
|
80
|
-
end
|
81
|
-
end
|
82
|
-
end
|
83
|
-
end
|
84
|
-
end
|
@@ -1,59 +0,0 @@
|
|
1
|
-
require 'scgi'
|
2
|
-
require 'stringio'
|
3
|
-
require 'rack/content_length'
|
4
|
-
require 'rack/chunked'
|
5
|
-
|
6
|
-
module Rack
|
7
|
-
module Handler
|
8
|
-
class SCGI < ::SCGI::Processor
|
9
|
-
attr_accessor :app
|
10
|
-
|
11
|
-
def self.run(app, options=nil)
|
12
|
-
new(options.merge(:app=>app,
|
13
|
-
:host=>options[:Host],
|
14
|
-
:port=>options[:Port],
|
15
|
-
:socket=>options[:Socket])).listen
|
16
|
-
end
|
17
|
-
|
18
|
-
def initialize(settings = {})
|
19
|
-
@app = Rack::Chunked.new(Rack::ContentLength.new(settings[:app]))
|
20
|
-
@log = Object.new
|
21
|
-
def @log.info(*args); end
|
22
|
-
def @log.error(*args); end
|
23
|
-
super(settings)
|
24
|
-
end
|
25
|
-
|
26
|
-
def process_request(request, input_body, socket)
|
27
|
-
env = {}.replace(request)
|
28
|
-
env.delete "HTTP_CONTENT_TYPE"
|
29
|
-
env.delete "HTTP_CONTENT_LENGTH"
|
30
|
-
env["REQUEST_PATH"], env["QUERY_STRING"] = env["REQUEST_URI"].split('?', 2)
|
31
|
-
env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
|
32
|
-
env["PATH_INFO"] = env["REQUEST_PATH"]
|
33
|
-
env["QUERY_STRING"] ||= ""
|
34
|
-
env["SCRIPT_NAME"] = ""
|
35
|
-
env.update({"rack.version" => [0,1],
|
36
|
-
"rack.input" => StringIO.new(input_body),
|
37
|
-
"rack.errors" => $stderr,
|
38
|
-
|
39
|
-
"rack.multithread" => true,
|
40
|
-
"rack.multiprocess" => true,
|
41
|
-
"rack.run_once" => false,
|
42
|
-
|
43
|
-
"rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
|
44
|
-
})
|
45
|
-
status, headers, body = app.call(env)
|
46
|
-
begin
|
47
|
-
socket.write("Status: #{status}\r\n")
|
48
|
-
headers.each do |k, vs|
|
49
|
-
vs.split("\n").each { |v| socket.write("#{k}: #{v}\r\n")}
|
50
|
-
end
|
51
|
-
socket.write("\r\n")
|
52
|
-
body.each {|s| socket.write(s)}
|
53
|
-
ensure
|
54
|
-
body.close if body.respond_to? :close
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|