Skip to content

Conversation

@ariel-
Copy link
Contributor

@ariel- ariel- commented Mar 29, 2015

No description provided.

@jackpoz
Copy link
Member

jackpoz commented Mar 29, 2015

the commit should be generated with git cherry-pick command, including the source commit reference (-x parameter should do it)

@ariel-
Copy link
Contributor Author

ariel- commented Mar 29, 2015

Fix'd

@ariel- ariel- force-pushed the bed88e0 branch 2 times, most recently from ce62784 to 2acbd49 Compare March 29, 2015 17:26
…Socket

(cherry picked from commit bed88e0)

Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
@Shauren
Copy link
Member

Shauren commented Mar 31, 2015

add 3da0f7e

…to be kicked for overspeed pings

(cherry picked from commit 3da0f7e)
@jackpoz
Copy link
Member

jackpoz commented Apr 3, 2015

this code keeps being changed in 6.x and these changes are being tracked at #14418 . while we thank you for the effort into submitting a PR, I have to close it because we prefer to deal with cherry-picks on our own .

It might be better also to merge these changes when they are stable on 6.x

@jackpoz jackpoz closed this Apr 3, 2015
Shauren added a commit that referenced this pull request Apr 4, 2015
…Socket

(cherry picked from commit bed88e0)

Core/Networking: Fixed deadlock in HandlePing if the client is about to be kicked for overspeed pings

(cherry picked from commit 3da0f7e)

Core/Networking: Cleanup CloseSocket calls from read failures in WorldSocket

(cherry picked from commit 18343a7)

Conflicts:
	src/server/game/Server/WorldSocket.cpp

Ref #14474
@ariel- ariel- deleted the bed88e0 branch June 27, 2015 01:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants