diff -N -c -r -X exclude_files squid-1.0.beta6/src/ftpget.c squid-1.0.beta6.henrik/src/ftpget.c *** squid-1.0.beta6/src/ftpget.c Sat May 4 17:00:26 1996 --- squid-1.0.beta6.henrik/src/ftpget.c Sat May 4 17:28:03 1996 *************** *** 1770,1777 **** readme->path = xstrdup("README"); readme->cfd = fd; readme->sfd = r->sfd; ! readme->dfd = r->dfd; ! r->dfd = -1; #ifdef TRY_CWD_FIRST readme->state = CWD_FAIL; #else --- 1770,1781 ---- readme->path = xstrdup("README"); readme->cfd = fd; readme->sfd = r->sfd; ! if(is_dfd_open(r)) { ! readme->dfd = r->dfd; ! r->dfd = -1; ! } else { ! readme->dfd = -1; ! } #ifdef TRY_CWD_FIRST readme->state = CWD_FAIL; #else *************** *** 1784,1794 **** close(readme->cfd); readme->cfd = -1; } ! if (readme->dfd >= 0) { close_dfd(r); r->dfd = readme->dfd; readme->dfd = -1; } fp = fopen(tfname, "r"); unlink(tfname); --- 1788,1799 ---- close(readme->cfd); readme->cfd = -1; } ! if (is_dfd_open(readme)) { close_dfd(r); r->dfd = readme->dfd; readme->dfd = -1; } + fp = fopen(tfname, "r"); unlink(tfname);