Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

transport: wrap timeout listener with tls listener #5998

Merged
merged 1 commit into from
Jul 20, 2016

Conversation

heyitsanthony
Copy link
Contributor

Otherwise the listener will return timeoutConn's, causing a type
assertion to tls.Conn in net.http to fail so http.Request.TLS is never set.

/cc @xiang90 @kayrus

Otherwise the listener will return timeoutConn's, causing a type
assertion to tls.Conn in net.http to fail so http.Request.TLS is never set.
@xiang90
Copy link
Contributor

xiang90 commented Jul 19, 2016

so we have a tls listener inside that wrapped by a timeout listener and then wrapped by a tls listener again?

@heyitsanthony
Copy link
Contributor Author

@xiang90 the tls listener wraps the timeout listener now (Accept returns a tls.Conn wrapping a timeoutConn), before it was the timeout listener wraps the tls listener (Accept returns timeoutConn wrapping a tls.Conn)

@xiang90
Copy link
Contributor

xiang90 commented Jul 20, 2016

Lgtm

@heyitsanthony heyitsanthony merged commit 6e290ab into etcd-io:master Jul 20, 2016
@heyitsanthony heyitsanthony deleted the tls-timeout-conn branch July 20, 2016 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants