Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
fec0ea9d
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,发现更多精彩内容 >>
提交
fec0ea9d
编写于
12月 28, 2008
作者:
P
Pratik Naik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Request#env['SERVER_NAME'] does not contain port number
上级
c0c79f77
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
8 deletion
+4
-8
actionpack/lib/action_controller/request.rb
actionpack/lib/action_controller/request.rb
+1
-1
actionpack/lib/action_controller/test_process.rb
actionpack/lib/action_controller/test_process.rb
+1
-5
actionpack/test/controller/rack_test.rb
actionpack/test/controller/rack_test.rb
+2
-2
未找到文件。
actionpack/lib/action_controller/request.rb
浏览文件 @
fec0ea9d
...
...
@@ -286,7 +286,7 @@ def raw_host_with_port
if
forwarded
=
env
[
"HTTP_X_FORWARDED_HOST"
]
forwarded
.
split
(
/,\s?/
).
last
else
env
[
'HTTP_HOST'
]
||
env
[
'SERVER_NAME'
]
||
"
#{
env
[
'SERVER_ADDR'
]
}
:
#{
env
[
'SERVER_PORT'
]
}
"
env
[
'HTTP_HOST'
]
||
"
#{
env
[
'SERVER_NAME'
]
||
env
[
'SERVER_ADDR'
]
}
:
#{
env
[
'SERVER_PORT'
]
}
"
end
end
...
...
actionpack/lib/action_controller/test_process.rb
浏览文件 @
fec0ea9d
...
...
@@ -33,11 +33,7 @@ class TestRequest < Request #:nodoc:
attr_accessor
:host
def
initialize
env
=
Rack
::
MockRequest
.
env_for
(
"/"
)
# TODO: Fix Request to assume env['SERVER_ADDR'] doesn't contain port number
env
[
'SERVER_ADDR'
]
=
env
.
delete
(
"SERVER_NAME"
)
super
(
env
)
super
(
Rack
::
MockRequest
.
env_for
(
"/"
))
@query_parameters
=
{}
@session
=
TestSession
.
new
...
...
actionpack/test/controller/rack_test.rb
浏览文件 @
fec0ea9d
...
...
@@ -4,7 +4,7 @@ class BaseRackTest < Test::Unit::TestCase
def
setup
@env
=
{
"HTTP_MAX_FORWARDS"
=>
"10"
,
"SERVER_NAME"
=>
"glu.ttono.us
:8007
"
,
"SERVER_NAME"
=>
"glu.ttono.us"
,
"FCGI_ROLE"
=>
"RESPONDER"
,
"AUTH_TYPE"
=>
"Basic"
,
"HTTP_X_FORWARDED_HOST"
=>
"glu.ttono.us"
,
...
...
@@ -145,7 +145,7 @@ def test_cgi_environment_variables
assert_equal
"kevin"
,
@request
.
remote_user
assert_equal
:get
,
@request
.
request_method
assert_equal
"/dispatch.fcgi"
,
@request
.
script_name
assert_equal
"glu.ttono.us
:8007
"
,
@request
.
server_name
assert_equal
"glu.ttono.us"
,
@request
.
server_name
assert_equal
8007
,
@request
.
server_port
assert_equal
"HTTP/1.1"
,
@request
.
server_protocol
assert_equal
"lighttpd"
,
@request
.
server_software
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录