Original release 20150729

[fex.git] / bin / fexsend

diff --git a/bin/fexsend b/bin/fexsend
index a0eabe189aadc858c4d80a7dfa06c5a29ebae23a..16235b7746f93a57cff4409813edb58cc2159260 100755 (executable)
--- a/bin/fexsend
+++ b/bin/fexsend
@@ -37,7 +37,7 @@ our ($tpid,$frecipient);
 our ($FEXID,$FEXXX,$HOME);
 our (%alias);
 our $chunksize = 0;
 our ($FEXID,$FEXXX,$HOME);
 our (%alias);
 our $chunksize = 0;

-our $version = 20150615;
+our $version = 20150729;

 our $_0 = $0;
 our $DEBUG;
 
 our $_0 = $0;
 our $DEBUG;
 


@@ -81,7 +81,7 @@ my $atype = '';               # archive type
 my $fexcgi;            # F*EX CGI URL
 my @files;             # files to send
 my %AB = ();           # server based address book
 my $fexcgi;            # F*EX CGI URL
 my @files;             # files to send
 my %AB = ();           # server based address book

-my ($server,$port,$sid);
+my ($server,$port,$sid,$https);

 my $proxy = '';
 my $proxy_prefix = '';
 my $features = ''; 
 my $proxy = '';
 my $proxy_prefix = '';
 my $features = ''; 


@@ -108,7 +108,7 @@ usage: $0 [options] file(s) [@] recipient(s)
    or: $0 -x \# [-C -k -D -K -S]
 options: -v           verbose mode
          -d           delete file on fex server
    or: $0 -x \# [-C -k -D -K -S]
 options: -v           verbose mode
          -d           delete file on fex server

-         -c           compress file
+         -c           compress file with gzip

          -g           encrypt file with gpg
          -m limit     limit throughput (kB/s)
          -i tag       use ID data [tag] from ID file
          -g           encrypt file with gpg
          -m limit     limit throughput (kB/s)
          -i tag       use ID data [tag] from ID file


@@ -498,9 +498,10 @@ $port = 80;
 $port = 443 if $server =~ s{https://}{};
 $port = $1  if $server =~ s/:(\d+)//;
 
 $port = 443 if $server =~ s{https://}{};
 $port = $1  if $server =~ s/:(\d+)//;
 

-if (0 and $port == 443) {
-  $opt_s and die "$0: cannot use -s with https due to stunnel bug\n"; 
-  $opt_g and die "$0: cannot use -g with https due to stunnel bug\n"; 
+if ($port == 443) {
+  # $opt_s and die "$0: cannot use -s with https due to stunnel bug\n"; 
+  # $opt_g and die "$0: cannot use -g with https due to stunnel bug\n"; 
+  $https = $port;

 }
 
 $server =~ s{http://}{};
 }
 
 $server =~ s{http://}{};


@@ -1474,6 +1475,17 @@ sub send_fex {
           }
         }
       }
           }
         }
       }

+      unless ($opt_d or $location) {
+        if (scalar(@r) == 1) {
+          die "$0: server error: @r\n";
+        } else {
+          if ($r[0] !~ /HTTP.1.. 2/ and $r[0] =~ /HTTP.[\s\d.]+(.+)/) {
+            die "$0: server error: $1\n";
+          } else {
+            die "$0: server error:\n".join("\n",@r)."\n";
+          }
+        }
+      }

     }
   }
   
     }
   }
   


@@ -2052,7 +2064,11 @@ sub formdatapost {
       $SIG{ALRM} = sub { retry("timed out") };
       while (my $b = read $file,$buf,$bs) {
         alarm($timeout*2);
       $SIG{ALRM} = sub { retry("timed out") };
       while (my $b = read $file,$buf,$bs) {
         alarm($timeout*2);

-        syswrite $SH,$buf or &sigpipehandler;
+        if ($https) {
+          print {$SH} $buf or &sigpipehandler;
+        } else {
+          syswrite $SH,$buf or &sigpipehandler;
+        }

         alarm(0);
         $bytes += $b;
         if ($filesize > 0 and $bytes+$seek > $filesize) {
         alarm(0);
         $bytes += $b;
         if ($filesize > 0 and $bytes+$seek > $filesize) {


@@ -2974,7 +2990,7 @@ sub serverconnect {
   
   if ($proxy) {
     tcpconnect(split(':',$proxy));
   
   if ($proxy) {
     tcpconnect(split(':',$proxy));

-    if ($port == 443) {
+    if ($https) {

       printf "--> %s\n",$connect if $opt_v;
       nvtsend($connect,"");
       $_ = <$SH>;
       printf "--> %s\n",$connect if $opt_v;
       nvtsend($connect,"");
       $_ = <$SH>;


@@ -2989,7 +3005,7 @@ sub serverconnect {
   } else {
     tcpconnect($server,$port);
   }
   } else {
     tcpconnect($server,$port);
   }

-#  if ($port == 443 and $opt_v) {
+#  if ($https and $opt_v) {

 #    printf "%s\n",$SH->get_cipher();
 #  }
 }
 #    printf "%s\n",$SH->get_cipher();
 #  }
 }


@@ -3004,7 +3020,7 @@ sub tcpconnect {
     undef $SH;
   }
   
     undef $SH;
   }
   

-  if ($port == 443) {
+  if ($https) {

     # eval "use IO::Socket::SSL qw(debug3)";
     &enable_ssl;
     $SH = IO::Socket::SSL->new(
     # eval "use IO::Socket::SSL qw(debug3)";
     &enable_ssl;
     $SH = IO::Socket::SSL->new(