diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-13 16:15:45 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-13 16:15:45 +0000 |
| commit | 33042f4f96ba34e518d600921f4f88b7b697e16d (patch) | |
| tree | fa47698b40bde515b53b15af41d5282b3aba4ce5 | |
| parent | 7fae29dea80ba1c6b005b195dc65e5e4df73ae21 (diff) | |
| download | hercules-33042f4f96ba34e518d600921f4f88b7b697e16d.tar.gz hercules-33042f4f96ba34e518d600921f4f88b7b697e16d.tar.bz2 hercules-33042f4f96ba34e518d600921f4f88b7b697e16d.tar.xz hercules-33042f4f96ba34e518d600921f4f88b7b697e16d.zip | |
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@555 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 3 | ||||
| -rw-r--r-- | src/common/socket.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt index 414f3c095..856e519df 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,4 +1,7 @@ Date Added +12/14 + * Fixed how socket handles EAGIN errors (retry instead of + disconnecting) [MouseJstr] 12/13 * Skill Updates [celest] - Added the new 'Throw Tomahawk' skill (Requires Sakexe1129 or newer) diff --git a/src/common/socket.c b/src/common/socket.c index 701d4e0de..415a011a4 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -16,6 +16,7 @@ #include <sys/time.h> #include <unistd.h> #include <sys/ioctl.h> +#include <errno.h> #endif #include <fcntl.h> @@ -147,7 +148,7 @@ static int send_from_fifo(int fd) } else { session[fd]->wdata_size=0; } - } else { + } else if (errno != EAGAIN) { printf("set eof :%d\n",fd); session[fd]->eof=1; } |