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.

Sign up for GitHub

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

Jump to bottom

Prioritise using provided socket factory when creating socket with proxy #1070

Merged
merged 3 commits into from
Sep 20, 2020
Merged

Prioritise using provided socket factory when creating socket with proxy #1070

merged 3 commits into from
Sep 20, 2020

Conversation

marci4
Copy link
Collaborator

@marci4 marci4 commented Sep 19, 2020

Description

Use the provided socket factory over a newly created one when creating a socket with a proxy

Related Issue

Fixes #1058

Motivation and Context

Bug fix

How Has This Been Tested?

Manual test. Contains NO automatic test

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@marci4 marci4 added this to the Release 1.5.2 milestone Sep 19, 2020
@marci4 marci4 requested a review from PhilipRoman September 19, 2020 11:21
PhilipRoman
PhilipRoman approved these changes Sep 19, 2020
View reviewed changes
Copy link
Collaborator

@PhilipRoman PhilipRoman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

src/main/java/org/java_websocket/client/WebSocketClient.java Outdated Show resolved Hide resolved
@marci4
Update WebSocketClient.java
e1061ae 
Rework after review
@marci4 marci4 merged commit a76e052 into TooTallNate:master Sep 20, 2020
@marci4 marci4 deleted the Issue1058 branch September 20, 2020 09:36
@marci4 marci4 mentioned this pull request Jan 5, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PhilipRoman PhilipRoman PhilipRoman approved these changes

Assignees
No one assigned
Labels
Bug Client
Projects
None yet
Milestone
Release 1.5.2
Development

Successfully merging this pull request may close these issues.

How to debugg the client using Fiddler or sth else
2 participants
@marci4 @PhilipRoman