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: 0x6a77/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.
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Jan 6, 2013

  1. Introduce IWebsocket interface so that the JWS library can play ball 

    with DI tools like Google Guice.
Fix some bugs around CLOSE_WAIT, partial buffer hangs, deadlocks, etc.
(Commented in the code - can remove if ported back to the mothership.)
May have messed up tabs vs. spaces here and there - was on accident.  It
would be better if JWS had a .project file that enforced a code style.
    @0x6a77
    0x6a77 committed Jan 6, 2013
    Configuration menu
    Copy the full SHA
    d57754a View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2013

  1. updates that include a new interface (& name)

    @0x6a77
    0x6a77 committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    782b31c View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2014

  1. Get my fork to come more in line with upstream (given that it now 

    supports the interfaces work from my fork)

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/example/ChatClient.java
	src/main/java/org/java_websocket/WebSocket.java
	src/main/java/org/java_websocket/WebSocketAdapter.java
	src/main/java/org/java_websocket/WebSocketListener.java
	src/main/java/org/java_websocket/client/WebSocketClient.java
	src/main/java/org/java_websocket/server/WebSocketServer.java
    @0x6a77
    0x6a77 committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    1683348 View commit details
    Browse the repository at this point in the history

  2. Get my fork to come more in line with upstream (given that it now 

    supports the interfaces work from my fork)

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/example/ChatClient.java
	src/main/java/org/java_websocket/WebSocket.java
	src/main/java/org/java_websocket/WebSocketAdapter.java
	src/main/java/org/java_websocket/WebSocketListener.java
	src/main/java/org/java_websocket/client/WebSocketClient.java
	src/main/java/org/java_websocket/server/WebSocketServer.java
    @0x6a77
    0x6a77 committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    671d87e View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2014

  1. * Merge branch 'master' of https://github.com/0x6a77/Java-WebSocket.git 

    * Add debugging and better handle exceptions thrown in SSL sockets.
    @0x6a77
    0x6a77 committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    a3d25de View commit details
    Browse the repository at this point in the history
Loading