mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-22 11:37:42 +02:00
18e62334f9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7148 3c298f89-4303-0410-b956-a3cf2f4a3e73
29 lines
1016 B
Diff
29 lines
1016 B
Diff
diff -ur db.old/common-channel.c db.dev/common-channel.c
|
|
--- db.old/common-channel.c 2007-02-22 17:17:15.000000000 +0100
|
|
+++ db.dev/common-channel.c 2007-05-06 19:50:19.154943528 +0200
|
|
@@ -309,15 +309,15 @@
|
|
&& (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)) {
|
|
send_msg_channel_eof(channel);
|
|
}
|
|
-
|
|
- /* And if we can't receive any more data from them either, close up */
|
|
- if (!channel->sent_close
|
|
- && channel->readfd == FD_CLOSED
|
|
- && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
|
|
- && !write_pending(channel)) {
|
|
- TRACE(("sending close, readfd is closed"))
|
|
- send_msg_channel_close(channel);
|
|
- }
|
|
+
|
|
+ /* And if we can't receive any more data from them either, close up (server only) */
|
|
+ if (!channel->sent_close
|
|
+ && channel->readfd == FD_CLOSED
|
|
+ && !ERRFD_IS_WRITE(channel)
|
|
+ && !write_pending(channel)) {
|
|
+ TRACE(("sending close, readfd is closed"))
|
|
+ send_msg_channel_close(channel);
|
|
+ }
|
|
}
|
|
|
|
/* Check whether a deferred (EINPROGRESS) connect() was successful, and
|