Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e1786ee6
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,体验更适合开发者的 AI 搜索 >>
提交
e1786ee6
编写于
10月 26, 2009
作者:
Y
Yehuda Katz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes expires_now and cleans things up a bit
上级
d7499f8e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
13 deletion
+22
-13
actionpack/lib/action_controller/metal/conditional_get.rb
actionpack/lib/action_controller/metal/conditional_get.rb
+1
-1
actionpack/lib/action_dispatch/http/request.rb
actionpack/lib/action_dispatch/http/request.rb
+9
-12
actionpack/lib/action_dispatch/http/response.rb
actionpack/lib/action_dispatch/http/response.rb
+2
-0
actionpack/test/controller/render_test.rb
actionpack/test/controller/render_test.rb
+10
-0
未找到文件。
actionpack/lib/action_controller/metal/conditional_get.rb
浏览文件 @
e1786ee6
...
...
@@ -80,7 +80,7 @@ def expires_in(seconds, options = {}) #:doc:
# Sets a HTTP 1.1 Cache-Control header of "no-cache" so no caching should occur by the browser or
# intermediate caches (like caching proxy servers).
def
expires_now
#:doc:
response
.
headers
[
"Cache-Control"
]
=
"no-cache"
response
.
cache_control
.
replace
(
:no_cache
=>
true
)
end
end
end
actionpack/lib/action_dispatch/http/request.rb
浏览文件 @
e1786ee6
...
...
@@ -136,19 +136,16 @@ def etag_matches?(etag)
# If-Modified-Since and If-None-Match conditions. If both headers are
# supplied, both must match, or the request is not considered fresh.
def
fresh?
(
response
)
case
when
if_modified_since
&&
if_none_match
not_modified?
(
response
.
last_modified
)
&&
etag_matches?
(
response
.
etag
)
when
if_modified_since
not_modified?
(
response
.
last_modified
)
when
if_none_match
etag_matches?
(
response
.
etag
)
else
false
end
end
last_modified
=
if_modified_since
etag
=
if_none_match
ONLY_ALL
=
[
Mime
::
ALL
].
freeze
return
false
unless
last_modified
||
etag
success
=
true
success
&&=
not_modified?
(
response
.
last_modified
)
if
last_modified
success
&&=
etag_matches?
(
response
.
etag
)
if
etag
success
end
# Returns the Mime type for the \format used in the request.
#
...
...
actionpack/lib/action_dispatch/http/response.rb
浏览文件 @
e1786ee6
...
...
@@ -270,6 +270,8 @@ def set_conditional_cache_control!
if
control
.
empty?
headers
[
"Cache-Control"
]
=
DEFAULT_CACHE_CONTROL
elsif
@cache_control
[
:no_cache
]
headers
[
"Cache-Control"
]
=
"no-cache"
else
extras
=
control
[
:extras
]
max_age
=
control
[
:max_age
]
...
...
actionpack/test/controller/render_test.rb
浏览文件 @
e1786ee6
...
...
@@ -73,6 +73,11 @@ def conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
render
:action
=>
'hello_world'
end
def
conditional_hello_with_expires_now
expires_now
render
:action
=>
'hello_world'
end
def
conditional_hello_with_bangs
render
:action
=>
'hello_world'
end
...
...
@@ -1321,6 +1326,11 @@ def test_expires_in_old_syntax
get
:conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
assert_equal
"max-age=60, public, max-stale=18000"
,
@response
.
headers
[
"Cache-Control"
]
end
def
test_expires_now
get
:conditional_hello_with_expires_now
assert_equal
"no-cache"
,
@response
.
headers
[
"Cache-Control"
]
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录