Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
515a1a33
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
515a1a33
编写于
1月 17, 2009
作者:
J
Joshua Peek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Lock middleware has been committed upstream
上级
3ee4e009
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
46 addition
and
40 deletion
+46
-40
actionpack/lib/action_controller.rb
actionpack/lib/action_controller.rb
+0
-1
actionpack/lib/action_controller/lock.rb
actionpack/lib/action_controller/lock.rb
+0
-16
actionpack/lib/action_controller/middlewares.rb
actionpack/lib/action_controller/middlewares.rb
+1
-1
actionpack/lib/action_controller/rack_ext.rb
actionpack/lib/action_controller/rack_ext.rb
+2
-22
actionpack/lib/action_controller/rack_ext/lock.rb
actionpack/lib/action_controller/rack_ext/lock.rb
+21
-0
actionpack/lib/action_controller/rack_ext/multipart.rb
actionpack/lib/action_controller/rack_ext/multipart.rb
+22
-0
未找到文件。
actionpack/lib/action_controller.rb
浏览文件 @
515a1a33
...
...
@@ -56,7 +56,6 @@ def self.load_all!
autoload
:Integration
,
'action_controller/integration'
autoload
:IntegrationTest
,
'action_controller/integration'
autoload
:Layout
,
'action_controller/layout'
autoload
:Lock
,
'action_controller/lock'
autoload
:MiddlewareStack
,
'action_controller/middleware_stack'
autoload
:MimeResponds
,
'action_controller/mime_responds'
autoload
:PolymorphicRoutes
,
'action_controller/polymorphic_routes'
...
...
actionpack/lib/action_controller/lock.rb
已删除
100644 → 0
浏览文件 @
3ee4e009
module
ActionController
class
Lock
FLAG
=
'rack.multithread'
.
freeze
def
initialize
(
app
,
lock
=
Mutex
.
new
)
@app
,
@lock
=
app
,
lock
end
def
call
(
env
)
old
,
env
[
FLAG
]
=
env
[
FLAG
],
false
@lock
.
synchronize
{
@app
.
call
(
env
)
}
ensure
env
[
FLAG
]
=
old
end
end
end
actionpack/lib/action_controller/middlewares.rb
浏览文件 @
515a1a33
use
"
ActionController
::Lock"
,
:if
=>
lambda
{
use
"
Rack
::Lock"
,
:if
=>
lambda
{
!
ActionController
::
Base
.
allow_concurrency
}
...
...
actionpack/lib/action_controller/rack_ext.rb
浏览文件 @
515a1a33
module
Rack
module
Utils
module
Multipart
class
<<
self
def
parse_multipart_with_rewind
(
env
)
result
=
parse_multipart_without_rewind
(
env
)
begin
env
[
'rack.input'
].
rewind
rescue
NoMethodError
,
Errno
::
ESPIPE
# Handles exceptions raised by input streams that cannot be rewound
# such as when using plain CGI under Apache
end
result
end
alias_method_chain
:parse_multipart
,
:rewind
end
end
end
end
require
'action_controller/rack_ext/lock'
require
'action_controller/rack_ext/multipart'
actionpack/lib/action_controller/rack_ext/lock.rb
0 → 100644
浏览文件 @
515a1a33
module
Rack
# Rack::Lock was commited to Rack core
# http://github.com/rack/rack/commit/7409b0c
# Remove this when Rack 1.0 is released
unless
defined?
Lock
class
Lock
FLAG
=
'rack.multithread'
.
freeze
def
initialize
(
app
,
lock
=
Mutex
.
new
)
@app
,
@lock
=
app
,
lock
end
def
call
(
env
)
old
,
env
[
FLAG
]
=
env
[
FLAG
],
false
@lock
.
synchronize
{
@app
.
call
(
env
)
}
ensure
env
[
FLAG
]
=
old
end
end
end
end
actionpack/lib/action_controller/rack_ext/multipart.rb
0 → 100644
浏览文件 @
515a1a33
module
Rack
module
Utils
module
Multipart
class
<<
self
def
parse_multipart_with_rewind
(
env
)
result
=
parse_multipart_without_rewind
(
env
)
begin
env
[
'rack.input'
].
rewind
rescue
NoMethodError
,
Errno
::
ESPIPE
# Handles exceptions raised by input streams that cannot be rewound
# such as when using plain CGI under Apache
end
result
end
alias_method_chain
:parse_multipart
,
:rewind
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录