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

vtls: deduplicate some DISABLE_PROXY ifdefs (continue #5735) #6660

Closed
wants to merge 1 commit into from

Conversation

@MAntoniak
Copy link
Contributor

@MAntoniak MAntoniak commented Feb 25, 2021

Using SSL_HOST_NAME, SSL_HOST_DISPNAME, SSL_PINNED_PUB_KEY for other tls backend
Create SSL_HOST_PORT

@MAntoniak MAntoniak force-pushed the MAntoniak:deduplicate_proxy branch 3 times, most recently from 4a4672a to 6dba086 Apr 12, 2021
@bagder
Copy link
Member

@bagder bagder commented Apr 22, 2021

@MAntoniak can you rebase this and fix the merge conflict? I would like to merge...

- using SSL_HOST_NAME, SSL_HOST_DISPNAME, SSL_PINNED_PUB_KEY for other tls backend
- create SSL_HOST_PORT
@MAntoniak MAntoniak force-pushed the MAntoniak:deduplicate_proxy branch from 6dba086 to c3c388e Apr 22, 2021
@MAntoniak
Copy link
Contributor Author

@MAntoniak MAntoniak commented Apr 22, 2021

@MAntoniak can you rebase this and fix the merge conflict? I would like to merge...

Done

@bagder
bagder approved these changes Apr 22, 2021
@bagder
Copy link
Member

@bagder bagder commented Apr 22, 2021

Awesome, thanks!

@bagder bagder closed this in e4ba999 Apr 22, 2021
@bagder
Copy link
Member

@bagder bagder commented Apr 22, 2021

Thanks!

@MAntoniak MAntoniak deleted the MAntoniak:deduplicate_proxy branch Apr 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants