Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
730f7255
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,发现更多精彩内容 >>
提交
730f7255
编写于
3月 19, 2013
作者:
A
Andrew White
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9794 from schneems/schneems/email-host
Fix improperly configured host in generated urls
上级
bdf1a2e7
334549b4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
1 deletion
+26
-1
actionpack/CHANGELOG.md
actionpack/CHANGELOG.md
+6
-0
actionpack/lib/action_dispatch/http/url.rb
actionpack/lib/action_dispatch/http/url.rb
+12
-1
actionpack/test/dispatch/url_generation_test.rb
actionpack/test/dispatch/url_generation_test.rb
+8
-0
未找到文件。
actionpack/CHANGELOG.md
浏览文件 @
730f7255
## Rails 4.0.0 (unreleased) ##
## Rails 4.0.0 (unreleased) ##
*
Allow default url options to accept host with protocol such as
`http://`
config.action_mailer.default_url_options = { host: "http://mydomain.com" }
*Richard Schneeman*
*
Ensure that digest authentication responds with a 401 status when a basic
*
Ensure that digest authentication responds with a 401 status when a basic
header is received.
header is received.
...
...
actionpack/lib/action_dispatch/http/url.rb
浏览文件 @
730f7255
...
@@ -59,8 +59,9 @@ def build_host_url(options)
...
@@ -59,8 +59,9 @@ def build_host_url(options)
result
=
""
result
=
""
unless
options
[
:only_path
]
unless
options
[
:only_path
]
protocol
=
extract_protocol
(
options
)
unless
options
[
:protocol
]
==
false
unless
options
[
:protocol
]
==
false
result
<<
(
options
[
:protocol
]
||
"http"
)
result
<<
protocol
result
<<
":"
unless
result
.
match
(
%r{:|//}
)
result
<<
":"
unless
result
.
match
(
%r{:|//}
)
end
end
result
<<
"//"
unless
result
.
match
(
"//"
)
result
<<
"//"
unless
result
.
match
(
"//"
)
...
@@ -83,6 +84,16 @@ def rewrite_authentication(options)
...
@@ -83,6 +84,16 @@ def rewrite_authentication(options)
end
end
end
end
# Extracts protocol http:// or https:// from options[:host]
# needs to be called whether the :protocol is being used or not
def
extract_protocol
(
options
)
if
options
[
:host
]
&&
match
=
options
[
:host
].
match
(
/(^.*:\/\/)(.*)/
)
options
[
:protocol
]
||=
match
[
1
]
options
[
:host
]
=
match
[
2
]
end
options
[
:protocol
]
||
"http"
end
def
host_or_subdomain_and_domain
(
options
)
def
host_or_subdomain_and_domain
(
options
)
return
options
[
:host
]
if
!
named_host?
(
options
[
:host
])
||
(
options
[
:subdomain
].
nil?
&&
options
[
:domain
].
nil?
)
return
options
[
:host
]
if
!
named_host?
(
options
[
:host
])
||
(
options
[
:subdomain
].
nil?
&&
options
[
:domain
].
nil?
)
...
...
actionpack/test/dispatch/url_generation_test.rb
浏览文件 @
730f7255
...
@@ -48,6 +48,14 @@ def app
...
@@ -48,6 +48,14 @@ def app
https!
https!
assert_equal
"http://www.example.com/foo"
,
foo_url
(
:protocol
=>
"http"
)
assert_equal
"http://www.example.com/foo"
,
foo_url
(
:protocol
=>
"http"
)
end
end
test
"extracting protocol from host when protocol not present"
do
assert_equal
"httpz://www.example.com/foo"
,
foo_url
(
host:
"httpz://www.example.com"
,
protocol:
nil
)
end
test
"formatting host when protocol is present"
do
assert_equal
"http://www.example.com/foo"
,
foo_url
(
host:
"httpz://www.example.com"
,
protocol:
"http://"
)
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录