2004-08-10 [leroyc] 0.9.12cvs55.4

* src/common/socket.c
		Fix the possible race condition
This commit is contained in:
Colin Leroy 2004-08-10 08:54:43 +00:00
parent dcf91e5545
commit 5ab1401ed4
4 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2004-08-10 [leroyc] 0.9.12cvs55.4
* src/common/socket.c
Fix the possible race condition
2004-08-09 [paul] 0.9.12cvs55.3
* configure.ac

View file

@ -111,3 +111,4 @@
( cvs diff -u -r 1.115.2.13 -r 1.115.2.14 src/main.c; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/common/ssl.c; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/common/sylpheed.c; cvs diff -u -r 1.5 -r 1.6 src/common/sylpheed.h; ) > 0.9.12cvs55.1.patchset
( cvs diff -u -r 1.4.2.2 -r 1.4.2.3 autogen.sh; cvs diff -u -r 1.654.2.140 -r 1.654.2.141 configure.ac; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 po/poconv.sh; ) > 0.9.12cvs55.2.patchset
( cvs diff -u -r 1.654.2.141 -r 1.654.2.142 configure.ac; cvs diff -u -r 1.155.2.8 -r 1.155.2.9 src/Makefile.am; cvs diff -u -r 1.24.2.3 -r 1.24.2.4 src/common/Makefile.am; ) > 0.9.12cvs55.3.patchset
( cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/common/socket.c; ) > 0.9.12cvs55.4.patchset

View file

@ -13,7 +13,7 @@ INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=55
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=.3
EXTRA_GTK2_VERSION=.4
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

View file

@ -623,6 +623,9 @@ static gboolean sock_connect_async_cb(GIOChannel *source,
gint len;
SockInfo *sockinfo;
if (conn_data->io_tag == 0 && conn_data->channel == NULL)
return FALSE;
fd = g_io_channel_unix_get_fd(source);
conn_data->io_tag = 0;