Original release 20160919

[fex.git] / cgi-bin / fop

diff --git a/cgi-bin/fop b/cgi-bin/fop
index dec3abc0fe9c45192e62166f78962e9984a92feb..c5098fc4aa06aac1b6400ca520e0e06965cb66a4 100755 (executable)
--- a/cgi-bin/fop
+++ b/cgi-bin/fop
@@ -100,6 +100,7 @@ if ($file =~ m:^([^/]+)/[^/]+$:) {
   if ($mdomain and $file =~ s:(.+)/(.+)/(.+):$3:) {
     $to   = lc $1;
     $from = lc $2;
   if ($mdomain and $file =~ s:(.+)/(.+)/(.+):$3:) {
     $to   = lc $1;
     $from = lc $2;

+    $to   =~ s/[:,].*//;

     $to   .= '@'.$hostname if $to   eq 'anonymous';
     $from .= '@'.$hostname if $from eq 'anonymous';
     $to   .= '@'.$mdomain if -d "$to\@$mdomain";
     $to   .= '@'.$hostname if $to   eq 'anonymous';
     $from .= '@'.$hostname if $from eq 'anonymous';
     $to   .= '@'.$mdomain if -d "$to\@$mdomain";


@@ -733,6 +734,7 @@ sub sendfile {
     } else {
       $range = sprintf("bytes %s-%s/%s",$seek,$total_size-1,$total_size);
     }
     } else {
       $range = sprintf("bytes %s-%s/%s",$seek,$total_size-1,$total_size);
     }

+    # RFC 7233 "Responses to a Range Request"

     nvt_print(
       'HTTP/1.1 206 Partial Content',
       "Content-Length: $size",
     nvt_print(
       'HTTP/1.1 206 Partial Content',
       "Content-Length: $size",


@@ -764,6 +766,7 @@ sub sendfile {
           "Connection: close",
         );
 #        nvt_print('','HTTP/1.1 200 OK',"Content-Length: $size","Content-Type: $type"); exit;
           "Connection: close",
         );
 #        nvt_print('','HTTP/1.1 200 OK',"Content-Length: $size","Content-Type: $type"); exit;

+        nvt_print($_) foreach(@extra_header);

       } else {
         http_header('200 OK');
         print html_header($head);
       } else {
         http_header('200 OK');
         print html_header($head);


@@ -795,6 +798,7 @@ sub sendfile {
       if ($type eq 'application/octet-stream') {
         nvt_print(qq'Content-Disposition: attachment; filename="$filename"');
       }
       if ($type eq 'application/octet-stream') {
         nvt_print(qq'Content-Disposition: attachment; filename="$filename"');
       }

+      nvt_print($_) foreach(@extra_header);

     }
 
     nvt_print("X-Size: $total_size");
     }
 
     nvt_print("X-Size: $total_size");