/[pkgs]/rpms/openssh/devel/openssh-4.0p1-exit-deadlock.patch
ViewVC logotype

Contents of /rpms/openssh/devel/openssh-4.0p1-exit-deadlock.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Wed Jul 27 11:42:36 2005 UTC (4 years, 4 months ago) by tmraz
Branch: MAIN
CVS Tags: openssh-4_7p1-7_fc9, openssh-5_2p1-24_fc12, openssh-5_2p1-20_fc12, openssh-5_2p1-23_fc12, openssh-4_5p1-6_fc7, openssh-4_7p1-1_fc8, openssh-5_2p1-7_fc12, openssh-5_2p1-6_fc12, openssh-4_5p1-5_fc7, openssh-4_3p2-14_fc7, openssh-5_2p1-10_fc12, openssh-4_3p2-4, openssh-5_0p1-1_fc9, openssh-5_2p1-9_fc12, openssh-4_3p1-2, openssh-4_2p1-4, FC-5-split, openssh-4_2p1-10, openssh-5_2p1-18_fc12, openssh-4_3p1-1, openssh-5_1p1-2_fc10, openssh-4_5p1-3_fc7, openssh-5_3p1-7_fc13, openssh-5_2p1-5_fc12, openssh-4_7p1-8_fc9, F-7-split, openssh-4_3p1-2_1, openssh-4_3p2-11_fc7, openssh-4_2p1-9_1_1, openssh-5_2p1-4_fc12, openssh-5_1p1-4_fc11, openssh-4_7p1-2_fc8, openssh-4_5p1-2_fc7, openssh-4_5p1-6_fc7_persist_1, openssh-4_5p1-4_fc7, openssh-5_2p1-25_fc12, F-11-split, openssh-5_1p1-6_fc11, F-9-split, openssh-5_2p1-14_fc12, openssh-4_3p2-10, openssh-5_2p1-28_fc12, F-12-split, openssh-5_2p1-27_fc12, openssh-5_2p1-26_fc12, openssh-5_2p1-22_fc12, openssh-5_3p1-2_fc13, openssh-4_5p1-1_fc7, openssh-5_2p1-2_fc11, openssh-5_2p1-21_fc12, openssh-5_2p1-16_fc12, openssh-5_3p1-10_fc13, openssh-5_2p1-1_fc11, openssh-4_3p2-12_fc7, openssh-4_2p1-10_1, openssh-4_7p1-4_fc9, openssh-5_2p1-12_fc12, openssh-5_2p1-19_fc12, openssh-4_3p2-10_persist_1, openssh-5_2p1-8_fc12, openssh-5_3p1-3_fc13, openssh-5_1p1-5_fc11, openssh-5_1p1-1_fc10, openssh-4_2p1-7, openssh-4_2p1-6, openssh-4_2p1-5, openssh-5_2p1-17_fc12, openssh-4_2p1-3, openssh-4_2p1-2, openssh-4_2p1-1, openssh-4_7p1-5_fc9, openssh-4_5p1-8_fc8, openssh-4_7p1-9_fc9, openssh-4_2p1-9, openssh-4_2p1-8, openssh-5_2p1-11_fc12, openssh-5_1p1-8_fc11, openssh-5_3p1-8_fc13, openssh-5_2p1-15_fc12, openssh-5_3p1-5_fc13, F-10-split, openssh-5_0p1-2_fc10, openssh-4_3p2-1, openssh-4_3p2-3, openssh-4_3p2-2, openssh-4_3p2-5, openssh-5_3p1-9_fc13, openssh-4_3p2-7, openssh-4_3p2-6, openssh-4_3p2-9, openssh-4_3p2-8, openssh-4_3p2-13_fc7, openssh-4_1p1-4, openssh-4_1p1-5, F-8-split, openssh-5_3p1-1_fc13, openssh-5_1p1-7_fc11, openssh-5_1p1-3_fc10, FC-6-split, openssh-4_7p1-3_fc8, openssh-4_5p1-7_fc8, openssh-5_3p1-4_fc13, openssh-4_3p2-9_persist_1, openssh-5_0p1-3_fc10, openssh-5_3p1-6_fc13, openssh-5_2p1-29_fc13, openssh-4_3p2-5_1, HEAD
Branch point for: private-controlpersist-4_3p2-9-branch, private-openssh-4_5p1-6-controlpersist-branch
File MIME type: text/x-patch 
* Wed Jul 27 2005 Tomas Mraz <tmraz@redhat.com> 4.1p1-4
- don't deadlock on exit with multiple X forwarded channels (#152432)
- don't use X11 port which can't be bound on all IP families (#163732)
1 --- openssh-4.0p1/channels.c.exit-deadlock 2005-03-01 11:24:33.000000000 +0100
2 +++ openssh-4.0p1/channels.c 2005-04-05 22:25:15.197226237 +0200
3 @@ -1403,6 +1403,10 @@
4 u_int dlen;
5 int len;
6
7 + if(c->wfd != -1 && buffer_len(&c->output) > 0 && c->ostate == CHAN_OUTPUT_WAIT_DRAIN) {
8 + debug("channel %d: forcing write", c->self);
9 + FD_SET(c->wfd, writeset);
10 + }
11 /* Send buffered output data to the socket. */
12 if (c->wfd != -1 &&
13 FD_ISSET(c->wfd, writeset) &&
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2