Comparing TooTallNate:master...fomojola:master · TooTallNate/Java-WebSocket · GitHub
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TooTallNate/Java-WebSocket
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: fomojola/Java-WebSocket
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Jul 22, 2012

  1. Updated the SSLSocketChannel to wrap the SSL handshake bits into a se… 

    …parate block.

Updated the WebSocketClient to call the SSL handshake setup in specific cases where the connection may not have been open when the original SSLSocketChannel envelope was constructed.
    Femi Omojola committed Jul 22, 2012
    Configuration menu
    Copy the full SHA
    1f71e40 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2012

  1. Implementation of SSL support in the client. Doesn't work on Android … 

    …< 3.0 because of http://code.google.com/p/android/issues/detail?id=12955, but should work on desktop/server.
    Femi Omojola committed Jul 23, 2012
    Configuration menu
    Copy the full SHA
    086f773 View commit details
    Browse the repository at this point in the history
Loading