2 diff -c squid/src/ftp.c:1.316.2.29 squid/src/ftp.c:1.316.2.30
3 *** squid/src/ftp.c:1.316.2.29 Thu Sep 1 16:14:45 2005
4 --- squid/src/ftp.c Thu Sep 1 16:28:29 2005
8 int code = ftpState->ctrl.replycode;
9 debug(9, 3) ("This is ftpReadTransferDone\n");
11 /* Connection closed; retrieval done. */
12 if (ftpState->flags.html_header_sent)
13 ftpListingFinish(ftpState);
16 int code = ftpState->ctrl.replycode;
17 debug(9, 3) ("This is ftpReadTransferDone\n");
18 ! if (code == 226 || code == 250) {
19 /* Connection closed; retrieval done. */
20 if (ftpState->flags.html_header_sent)
21 ftpListingFinish(ftpState);
25 int code = ftpState->ctrl.replycode;
26 debug(9, 3) ("This is ftpWriteTransferDone\n");
28 debug(9, 1) ("ftpReadTransferDone: Got code %d after sending data\n",
30 ftpFailed(ftpState, ERR_FTP_PUT_ERROR);
33 int code = ftpState->ctrl.replycode;
34 debug(9, 3) ("This is ftpWriteTransferDone\n");
35 ! if (!(code == 226 || code == 250)) {
36 debug(9, 1) ("ftpReadTransferDone: Got code %d after sending data\n",
38 ftpFailed(ftpState, ERR_FTP_PUT_ERROR);
41 storeUrl(ftpState->entry), code);
42 if (cbdataValid(ftpState))
43 debug(9, 5) ("ftpSendReply: ftpState (%p) is valid!\n", ftpState);
45 err_code = (ftpState->mdtm > 0) ? ERR_FTP_PUT_MODIFIED : ERR_FTP_PUT_CREATED;
46 http_code = (ftpState->mdtm > 0) ? HTTP_ACCEPTED : HTTP_CREATED;
47 } else if (code == 227) {
49 storeUrl(ftpState->entry), code);
50 if (cbdataValid(ftpState))
51 debug(9, 5) ("ftpSendReply: ftpState (%p) is valid!\n", ftpState);
52 ! if (code == 226 || code == 250) {
53 err_code = (ftpState->mdtm > 0) ? ERR_FTP_PUT_MODIFIED : ERR_FTP_PUT_CREATED;
54 http_code = (ftpState->mdtm > 0) ? HTTP_ACCEPTED : HTTP_CREATED;
55 } else if (code == 227) {