1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

refresh all package patches in the buildroot using quilt

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2007-06-04 11:25:53 +00:00
parent cca016f893
commit b5cb1795de
184 changed files with 3022 additions and 2289 deletions

View File

@@ -1,28 +1,17 @@
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)) {
Index: dropbear-0.49/common-channel.c
===================================================================
--- dropbear-0.49.orig/common-channel.c 2007-06-04 13:21:39.354993800 +0200
+++ dropbear-0.49/common-channel.c 2007-06-04 13:21:40.676792856 +0200
@@ -310,10 +310,10 @@
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
- /* And if we can't receive any more data from them either, close up */
+ /* 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) || channel->errfd == FD_CLOSED)
+ && !ERRFD_IS_WRITE(channel)
&& !write_pending(channel)) {
TRACE(("sending close, readfd is closed"))
send_msg_channel_close(channel);