Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
96fa4c4b
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
96fa4c4b
编写于
9月 21, 2011
作者:
S
Seiji Sogabe
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-11068] Port on HTTP Proxy Configure accepts characters except the digits
上级
e0f6a7a9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
5 deletion
+29
-5
changelog.html
changelog.html
+3
-1
core/src/main/java/hudson/PluginManager.java
core/src/main/java/hudson/PluginManager.java
+20
-3
core/src/main/resources/hudson/Messages.properties
core/src/main/resources/hudson/Messages.properties
+2
-0
core/src/main/resources/hudson/Messages_ja.properties
core/src/main/resources/hudson/Messages_ja.properties
+2
-0
core/src/main/resources/hudson/PluginManager/advanced.jelly
core/src/main/resources/hudson/PluginManager/advanced.jelly
+2
-1
未找到文件。
changelog.html
浏览文件 @
96fa4c4b
...
...
@@ -55,7 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
>
<li
class=
bug
>
Port on HTTP Proxy Configure accepts characters except the digits
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-11068"
>
issue 11068
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/src/main/java/hudson/PluginManager.java
浏览文件 @
96fa4c4b
...
...
@@ -37,6 +37,7 @@ import hudson.model.UpdateCenter;
import
hudson.model.UpdateSite
;
import
hudson.util.CyclicGraphDetector
;
import
hudson.util.CyclicGraphDetector.CycleDetectedException
;
import
hudson.util.FormValidation
;
import
hudson.util.PersistedList
;
import
hudson.util.Service
;
import
org.apache.commons.fileupload.FileItem
;
...
...
@@ -565,15 +566,31 @@ public abstract class PluginManager extends AbstractModelObject {
hudson
.
proxy
=
null
;
ProxyConfiguration
.
getXmlFile
().
delete
();
}
else
try
{
hudson
.
proxy
=
new
ProxyConfiguration
(
server
,
Integer
.
parseInt
(
Util
.
fixNull
(
port
)),
int
proxyPort
=
Integer
.
parseInt
(
Util
.
fixNull
(
port
));
if
(
proxyPort
<
0
||
proxyPort
>
65535
)
{
throw
new
Failure
(
Messages
.
PluginManager_PortNotInRange
(
0
,
65535
));
}
hudson
.
proxy
=
new
ProxyConfiguration
(
server
,
proxyPort
,
Util
.
fixEmptyAndTrim
(
userName
),
Util
.
fixEmptyAndTrim
(
password
));
hudson
.
proxy
.
save
();
}
catch
(
NumberFormatException
nfe
)
{
return
HttpResponses
.
error
(
StaplerResponse
.
SC_BAD_REQUEST
,
new
IllegalArgumentException
(
"Invalid proxy port: "
+
port
,
nfe
));
throw
new
Failure
(
Messages
.
PluginManager_PortNotANumber
());
}
return
new
HttpRedirect
(
"advanced"
);
}
public
FormValidation
doCheckProxyPort
(
@QueryParameter
String
value
)
{
int
port
;
try
{
port
=
Integer
.
parseInt
(
value
);
}
catch
(
NumberFormatException
e
)
{
return
FormValidation
.
error
(
Messages
.
PluginManager_PortNotANumber
());
}
if
(
port
<
0
||
port
>
65535
)
{
return
FormValidation
.
error
(
Messages
.
PluginManager_PortNotInRange
(
0
,
65535
));
}
return
FormValidation
.
ok
();
}
/**
* Uploads a plugin.
...
...
core/src/main/resources/hudson/Messages.properties
浏览文件 @
96fa4c4b
...
...
@@ -50,5 +50,7 @@ Util.pastTime={0}
FilePath.TildaDoesntWork
=
''~'' is only supported in a Unix shell and nowhere else.
PluginManager.DisplayName
=
Plugin Manager
PluginManager.PortNotANumber
=
Port is not a number
PluginManager.PortNotInRange
=
Port does''t range from {0} to {1}
AboutJenkins.DisplayName
=
About Jenkins
AboutJenkins.Description
=
See the version and license information
core/src/main/resources/hudson/Messages_ja.properties
浏览文件 @
96fa4c4b
...
...
@@ -49,5 +49,7 @@ Util.pastTime={0} \u524d
FilePath.TildaDoesntWork
=
''~''
\u
306f
\u3001
Unix
\u
306e
\u
30b7
\u
30a7
\u
30eb
\u3067\u
306e
\u
307f
\u
30b5
\u
30dd
\u
30fc
\u
30c8
\u3055\u
308c
\u3066\u3044\u
307e
\u3059\u3002
PluginManager.DisplayName
=
\u
30d7
\u
30e9
\u
30b0
\u
30a4
\u
30f3
\u
30de
\u
30cd
\u
30fc
\u
30b8
\u
30e3
\u
30fc
PluginManager.PortNotANumber
=
\u
30dd
\u
30fc
\u
30c8
\u
756a
\u
53f7
\u
304c
\u6570\u
5b57
\u3067\u
306f
\u3042\u
308a
\u
307e
\u
305b
\u3093\u3002
PluginManager.PortNotInRange
=
\u
30dd
\u
30fc
\u
30c8
\u
756a
\u
53f7
\u
304c{0}
\u
304b
\u3089
{1}
\u
307e
\u3067\u3067\u
306f
\u3042\u
308a
\u
307e
\u
305b
\u3093\u3002
AboutJenkins.DisplayName
=
Jenkins
\u
306b
\u3064\u3044\u3066
AboutJenkins.Description
=
\u
30d0
\u
30fc
\u
30b8
\u
30e7
\u
30f3
\u3068\u
30e9
\u
30a4
\u
30bb
\u
30f3
\u
30b9
\u
60c5
\u5831\u3092\u8868\u
793a
\u3057\u
307e
\u3059\u3002
\ No newline at end of file
core/src/main/resources/hudson/PluginManager/advanced.jelly
浏览文件 @
96fa4c4b
...
...
@@ -41,7 +41,8 @@ THE SOFTWARE.
<f:textbox name="proxy.server" value="${app.proxy.name}" />
</f:entry>
<f:entry title="${%Port}" help="/help/update-center/proxy-port.html">
<f:textbox name="proxy.port" value="${app.proxy.port}" />
<f:textbox name="proxy.port" value="${app.proxy.port}"
checkUrl="'${rootURL}/pluginManager/checkProxyPort?value='+escape(this.value)" />
</f:entry>
</f:block>
<f:entry title="${%User name}" help="/help/update-center/proxy-username.html">
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录