Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
3e9ba863
Commit
3e9ba863
authored
8 years ago
by
Mark D. Roth
Browse files
Options
Downloads
Plain Diff
Merge branch 'security_handshaker1' into security_handshaker2
parents
71403820
8aa2f70f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/core/ext/client_channel/http_connect_handshaker.c
+3
-0
3 additions, 0 deletions
src/core/ext/client_channel/http_connect_handshaker.c
tools/run_tests/jobset.py
+11
-1
11 additions, 1 deletion
tools/run_tests/jobset.py
with
14 additions
and
1 deletion
src/core/ext/client_channel/http_connect_handshaker.c
+
3
−
0
View file @
3e9ba863
...
@@ -126,6 +126,9 @@ static void handshake_failed_locked(grpc_exec_ctx* exec_ctx,
...
@@ -126,6 +126,9 @@ static void handshake_failed_locked(grpc_exec_ctx* exec_ctx,
// Not shutting down, so the handshake failed. Clean up before
// Not shutting down, so the handshake failed. Clean up before
// invoking the callback.
// invoking the callback.
cleanup_args_for_failure_locked
(
handshaker
);
cleanup_args_for_failure_locked
(
handshaker
);
// Set shutdown to true so that subsequent calls to
// http_connect_handshaker_shutdown() do nothing.
handshaker
->
shutdown
=
true
;
}
}
// Invoke callback.
// Invoke callback.
grpc_exec_ctx_sched
(
exec_ctx
,
handshaker
->
on_handshake_done
,
error
,
NULL
);
grpc_exec_ctx_sched
(
exec_ctx
,
handshaker
->
on_handshake_done
,
error
,
NULL
);
...
...
This diff is collapsed.
Click to expand it.
tools/run_tests/jobset.py
+
11
−
1
View file @
3e9ba863
...
@@ -49,12 +49,22 @@ measure_cpu_costs = False
...
@@ -49,12 +49,22 @@ measure_cpu_costs = False
_DEFAULT_MAX_JOBS
=
16
*
multiprocessing
.
cpu_count
()
_DEFAULT_MAX_JOBS
=
16
*
multiprocessing
.
cpu_count
()
_MAX_RESULT_SIZE
=
8192
_MAX_RESULT_SIZE
=
8192
# NOTE: If you change this, please make sure to test reviewing the
# github PR with http://reviewable.io, which is known to add UTF-8
# characters to the PR description, which leak into the environment here
# and cause failures.
def
strip_non_ascii_chars
(
s
):
return
''
.
join
(
c
for
c
in
s
if
ord
(
c
)
<
128
)
def
sanitized_environment
(
env
):
def
sanitized_environment
(
env
):
sanitized
=
{}
sanitized
=
{}
for
key
,
value
in
env
.
items
():
for
key
,
value
in
env
.
items
():
sanitized
[
str
(
key
).
encode
()]
=
str
(
value
).
encode
(
)
sanitized
[
str
ip_non_ascii_chars
(
key
)]
=
strip_non_ascii_chars
(
value
)
return
sanitized
return
sanitized
def
platform_string
():
def
platform_string
():
if
platform
.
system
()
==
'
Windows
'
:
if
platform
.
system
()
==
'
Windows
'
:
return
'
windows
'
return
'
windows
'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment