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: socketio/engine.io-client-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mottx/engine.io-client.java
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.
  • 14 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 20, 2014

  1. MoChat current used modifications

    @mattohoh
    mattohoh committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    fa650b7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into mochat 

    Conflicts:
	src/main/java/com/github/nkzawa/engineio/client/Socket.java
	src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java
    @mattohoh
    mattohoh committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    cc9807c View commit details
    Browse the repository at this point in the history

  3. Add build.gradle

    @mattohoh
    mattohoh committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    e970d14 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2014

  1. Remove one line added by me

    @mattohoh
    mattohoh committed Dec 25, 2014
    Configuration menu
    Copy the full SHA
    d63f020 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2015

  1. Fix: Closing socket before open completed will cause disconnect incor… 

    …rectly
    @mattohoh
    mattohoh committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    da0665f View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2015

  1. Merge branch 'master' into mochat

    @mattohoh
    mattohoh committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    467abfb View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2015

  1. Merge commit '3bd78eb0b0b2ee824862a9d80f44d247241a9e02' into mochat

    @mattohoh
    mattohoh committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    9d324b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2016

  1. Update build.gradle

    @mattohoh
    mattohoh committed Jul 9, 2016
    Configuration menu
    Copy the full SHA
    e287900 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2019

  1. Merge remote-tracking branch 'upstream/master' into HEAD 

    # Conflicts:
#	src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java
#	src/main/java/io/socket/engineio/client/Socket.java
    @mattohoh
    mattohoh committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    db49805 View commit details
    Browse the repository at this point in the history

  2. Add missing PollingXHR.java

    @mattohoh
    mattohoh committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    84f415c View commit details
    Browse the repository at this point in the history

  3. Force use utf8 encoding when encode payload

    @mattohoh
    mattohoh committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    d9d3c82 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. Update to fix runtime crash on new JDK build env 

    see: https://www.morling.dev/blog/bytebuffer-and-the-dreaded-nosuchmethoderror/
    @mattohoh
    mattohoh committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    1211570 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. chore: update gitignore

    @mattohoh
    mattohoh committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    ea4b352 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2025

  1. Update to latest IDE env

    @mattohoh
    mattohoh committed Aug 4, 2025
    Configuration menu
    Copy the full SHA
    6f1e4d3 View commit details
    Browse the repository at this point in the history
Loading