Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
StackExchange.Redis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
StackExchange.Redis
Commits
86c0fa81
Commit
86c0fa81
authored
Sep 03, 2018
by
Marc Gravell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swap int.TryParse => Format.TryParse just in case #883 is locale-related
parent
d6653d3b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
27 deletions
+44
-27
Format.cs
src/StackExchange.Redis/Format.cs
+1
-1
ResultProcessor.cs
src/StackExchange.Redis/ResultProcessor.cs
+1
-1
SSL.cs
tests/StackExchange.Redis.Tests/SSL.cs
+42
-25
No files found.
src/StackExchange.Redis/Format.cs
View file @
86c0fa81
...
...
@@ -245,7 +245,7 @@ internal static EndPoint TryParseEndPoint(string addressWithPort)
int
?
port
=
0
;
if
(
portPart
!=
null
)
{
if
(
int
.
TryParse
(
portPart
,
out
var
portVal
))
if
(
Format
.
TryParseInt32
(
portPart
,
out
var
portVal
))
{
port
=
portVal
;
}
...
...
src/StackExchange.Redis/ResultProcessor.cs
View file @
86c0fa81
...
...
@@ -1916,7 +1916,7 @@ protected override bool SetResultCore(PhysicalConnection connection, Message mes
{
return
true
;
}
else
if
(
arr
.
Length
==
2
&&
int
.
TryParse
(
arr
[
1
],
out
var
port
))
else
if
(
arr
.
Length
==
2
&&
Format
.
TryParseInt32
(
arr
[
1
],
out
var
port
))
{
SetResult
(
message
,
Format
.
ParseEndPoint
(
arr
[
0
],
port
));
return
true
;
...
...
tests/StackExchange.Redis.Tests/SSL.cs
View file @
86c0fa81
using
System
;
using
System.Collections.Generic
;
using
System.Diagnostics
;
using
System.Globalization
;
using
System.IO
;
using
System.Linq
;
using
System.Net
;
...
...
@@ -331,33 +332,49 @@ private void Check(string name, object x, object y)
[
Fact
]
public
void
Issue883_Exhaustive
()
{
var
a
=
ConnectionMultiplexer
.
PrepareConfig
(
"myDNS:883,password=mypassword,connectRetry=3,connectTimeout=5000,syncTimeout=5000,defaultDatabase=0,ssl=true,abortConnect=false"
)
;
var
b
=
ConnectionMultiplexer
.
PrepareConfig
(
new
ConfigurationOptions
var
old
=
CultureInfo
.
CurrentCulture
;
try
{
EndPoints
=
{
{
"myDNS"
,
883
}
},
Password
=
"mypassword"
,
ConnectRetry
=
3
,
ConnectTimeout
=
5000
,
SyncTimeout
=
5000
,
DefaultDatabase
=
0
,
Ssl
=
true
,
AbortOnConnectFail
=
false
,
});
Writer
.
WriteLine
(
$"computed:
{
b
.
ToString
(
true
)}
"
);
Writer
.
WriteLine
(
"Checking endpoints..."
);
var
c
=
a
.
EndPoints
.
Cast
<
DnsEndPoint
>().
Single
();
var
d
=
b
.
EndPoints
.
Cast
<
DnsEndPoint
>().
Single
();
Check
(
nameof
(
c
.
Host
),
c
.
Host
,
d
.
Host
);
Check
(
nameof
(
c
.
Port
),
c
.
Port
,
d
.
Port
);
Check
(
nameof
(
c
.
AddressFamily
),
c
.
AddressFamily
,
d
.
AddressFamily
);
var
fields
=
typeof
(
ConfigurationOptions
).
GetFields
(
BindingFlags
.
Instance
|
BindingFlags
.
Public
|
BindingFlags
.
NonPublic
);
Writer
.
WriteLine
(
$"Comparing
{
fields
.
Length
}
fields..."
);
Array
.
Sort
(
fields
,
(
x
,
y
)
=>
string
.
Compare
(
x
.
Name
,
y
.
Name
));
foreach
(
var
field
in
fields
)
var
all
=
CultureInfo
.
GetCultures
(
CultureTypes
.
AllCultures
);
Writer
.
WriteLine
(
$"Checking
{
all
.
Length
}
cultures..."
);
foreach
(
var
ci
in
all
)
{
Writer
.
WriteLine
(
"Tessting: "
+
ci
.
Name
);
CultureInfo
.
CurrentCulture
=
ci
;
var
a
=
ConnectionMultiplexer
.
PrepareConfig
(
"myDNS:883,password=mypassword,connectRetry=3,connectTimeout=5000,syncTimeout=5000,defaultDatabase=0,ssl=true,abortConnect=false"
);
var
b
=
ConnectionMultiplexer
.
PrepareConfig
(
new
ConfigurationOptions
{
EndPoints
=
{
{
"myDNS"
,
883
}
},
Password
=
"mypassword"
,
ConnectRetry
=
3
,
ConnectTimeout
=
5000
,
SyncTimeout
=
5000
,
DefaultDatabase
=
0
,
Ssl
=
true
,
AbortOnConnectFail
=
false
,
});
Writer
.
WriteLine
(
$"computed:
{
b
.
ToString
(
true
)}
"
);
Writer
.
WriteLine
(
"Checking endpoints..."
);
var
c
=
a
.
EndPoints
.
Cast
<
DnsEndPoint
>().
Single
();
var
d
=
b
.
EndPoints
.
Cast
<
DnsEndPoint
>().
Single
();
Check
(
nameof
(
c
.
Host
),
c
.
Host
,
d
.
Host
);
Check
(
nameof
(
c
.
Port
),
c
.
Port
,
d
.
Port
);
Check
(
nameof
(
c
.
AddressFamily
),
c
.
AddressFamily
,
d
.
AddressFamily
);
var
fields
=
typeof
(
ConfigurationOptions
).
GetFields
(
BindingFlags
.
Instance
|
BindingFlags
.
Public
|
BindingFlags
.
NonPublic
);
Writer
.
WriteLine
(
$"Comparing
{
fields
.
Length
}
fields..."
);
Array
.
Sort
(
fields
,
(
x
,
y
)
=>
string
.
Compare
(
x
.
Name
,
y
.
Name
));
foreach
(
var
field
in
fields
)
{
Check
(
field
.
Name
,
field
.
GetValue
(
a
),
field
.
GetValue
(
b
));
}
}
}
finally
{
C
heck
(
field
.
Name
,
field
.
GetValue
(
a
),
field
.
GetValue
(
b
))
;
C
ultureInfo
.
CurrentCulture
=
old
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment