/[gentoo-x86]/net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch
Gentoo

Contents of /net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Fri Mar 16 16:48:39 2012 UTC (2 years, 6 months ago) by jer
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Fix bug #408231. Set RDEPEND. Move preparation stuff to src_prepare(). Respect LDFLAGS. Remove old patches. Do not automagically compile against dev-libs/openssl.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

1 --- pftpfxp-mew.orig/src/server.cc Sun Nov 9 20:51:19 2003
2 +++ pftpfxp-mew/src/server.cc Wed Jun 9 10:59:21 2004
3 @@ -3277,7 +3277,14 @@
4 return (FALSE);
5 }
6 } else {
7 - if (!this->tcp.SendData("PASV\r\n")) {
8 + sprintf(this->temp_string, "PRET RETR %s\r\n", file);
9 + if (!this->tcp.SendData(this->temp_string)) {
10 + this->error = E_CONTROL_RESET;
11 + this->PostBusy(NULL);
12 + return (FALSE);
13 + }
14 + this->tcp.WaitForMessage();
15 + if (!this->tcp.SendData("PASV\r\n")) {
16 this->error = E_CONTROL_RESET;
17 this->PostBusy(NULL);
18 return (FALSE);
19 @@ -3687,7 +3694,15 @@
20 }
21
22 if (fxpmethod == 0) {
23 - if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) {
24 + sprintf(this->temp_string, "PRET RETR %s\r\n", file);
25 + if (!this->tcp.SendData(this->temp_string)) {
26 + this->error = E_CONTROL_RESET;
27 + this->PostBusy(NULL);
28 + dest->PostBusy(NULL);
29 + return (FALSE);
30 + }
31 + this->tcp.WaitForMessage();
32 + if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) {
33 // dest & src support ssl and want ssl_fxp
34 // send CPSV, extract PORT info and post file, then wait (until DEST sent PORT and then STOR)
35 if (!this->tcp.SendData("CPSV\r\n")) {
36 @@ -3909,7 +3924,15 @@
37 fxpmeth1:
38 if (fxpmethod == 1) {
39 debuglog("normal fxp rejected trying alternative method");
40 - if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) {
41 + sprintf(this->temp_string, "PRET STOR %s\r\n", file);
42 + if (!dest->tcp.SendData(this->temp_string)) {
43 + this->error = E_CONTROL_RESET;
44 + this->PostBusy(NULL);
45 + dest->PostBusy(NULL);
46 + return (FALSE);
47 + }
48 + dest->tcp.WaitForMessage();
49 + if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) {
50 // dest & src support ssl and want ssl_fxp
51 // send CPSV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR)
52 if (!dest->tcp.SendData("CPSV\r\n")) {
53 @@ -3920,8 +3943,15 @@
54 return (FALSE);
55 }
56 } else {
57 - // send PASV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR)
58 - if (!dest->tcp.SendData("PASV\r\n")) {
59 + sprintf(this->temp_string, "PRET STOR %s\r\n", file);
60 + if (!this->tcp.SendData(this->temp_string)) {
61 + this->error = E_CONTROL_RESET;
62 + this->PostBusy(NULL);
63 + return (FALSE);
64 + }
65 + this->tcp.WaitForMessage();
66 + // send PASV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR)
67 + if (!dest->tcp.SendData("PASV\r\n")) {
68 this->error = E_CONTROL_RESET;
69 this->PostBusy(NULL);
70 dest->PostBusy(NULL);
71 @@ -4080,7 +4110,7 @@
72 }
73 }
74 //this->PostStatusFile(file, "RETR_OK", port_msg); // notify dest and GO!
75 - this->PostBusy("FXP>");
76 + this->PostBusy("FXP>");
77 dest->PostBusy("FXP<");
78 this->StartTime();
79 dest->StartTime();
80 @@ -4491,6 +4521,13 @@
81 return (FALSE);
82 }
83 } else { /* PASV MODE */
84 + if(!this->tcp.SendData("PRET LIST\r\n")) {
85 + this->error = E_CONTROL_RESET;
86 + this->PostBusy(NULL);
87 + return (FALSE);
88 + }
89 + this->tcp.WaitForMessage();
90 +
91 if (!this->tcp.SendData("PASV\r\n")) {
92 this->error = E_CONTROL_RESET;
93 this->PostBusy(NULL);

  ViewVC Help
Powered by ViewVC 1.1.20