Changeset 813

Timestamp:

01/28/09 20:02:26 (10 months ago)

Author:

ask

Message:

Fix X-REPROXY-FILE to work with SSL connections (Greg Denton)

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• lib/Perlbal/ClientHTTPBase.pm (modified) (3 diffs)

trunk/CHANGES

@@ +1 @@
+    -- Fix X-REPROXY-FILE to work with SSL connections (Greg Denton)
+
     -- Syslog as 'crit' rather than 'critical' (noticed by Richard Bronosky)
 

trunk/lib/Perlbal/ClientHTTPBase.pm

@@ -295 +295 @@
 }
 
+sub reproxy_file_done {
+    my Perlbal::ClientHTTPBase $self = shift;
+    return if $self->{service}->run_hook('reproxy_fh_finished', $self);
+    # close the sendfile fd
+    CORE::close($self->{reproxy_fh});
+    $self->{reproxy_fh} = undef;
+    if (my $cb = $self->{post_sendfile_cb}) {
+        $cb->();
+    } else {
+        $self->http_response_sent;
+    }
+}
+
 # client is ready for more of its file.  so sendfile some more to it.
 # (called by event_write when we're actually in this mode)
@@ -302 +315 @@
     my $remain = $self->{reproxy_file_size} - $self->{reproxy_file_offset};
     $self->tcp_cork(1) if $self->{reproxy_file_offset} == 0;
+    $self->watch_write(0);
+
+    if ($self->{service}->{listener}->{sslopts}) { # SSL (sendfile does not do SSL)
+        return if $self->{closed};
+        if ($remain <= 0) { #done
+            print "REPROXY SSL done\n" if Perlbal::DEBUG >= 2;
+            $self->reproxy_file_done;
+            return;
+        }
+        # queue up next read
+        Perlbal::AIO::set_file_for_channel($self->{reproxy_file});
+        my $len = $remain > 4096 ? 4096 : $remain; # buffer size
+        my $buffer = '';
+        Perlbal::AIO::aio_read(
+            $self->{reproxy_fh},
+            $self->{reproxy_file_offset},
+            $len,
+            $buffer,
+            sub {
+                return if $self->{closed};
+                # we have buffer to send
+                my $rv = $_[0]; # arg is result of sysread
+                if (!defined($rv) || $rv <= 0) { # read error
+                    # sysseek is called after sysread so $! not valid
+                    $self->close('sysread_error');
+                    print STDERR "Error w/ reproxy sysread\n";
+                    return;
+                }
+                $self->{reproxy_file_offset} += $rv;
+                $self->tcp_cork(1); # by setting reproxy_file_offset above,
+                                    # it won't cork, so we cork it
+                $self->write($buffer); # start socket send
+                $self->watch_write(1);
+            } 
+        );
+        return;
+    }
 
     # cap at 128k sendfiles
     my $to_send = $remain > 128 * 1024 ? 128 * 1024 : $remain;
-
-    $self->watch_write(0);
 
     my $postread = sub {
@@ -327 +375 @@
 
         if ($sent >= $remain) {
-            return if $self->{service}->run_hook('reproxy_fh_finished', $self);
-
-            # close the sendfile fd
-            CORE::close($self->{reproxy_fh});
-
-            $self->{reproxy_fh} = undef;
-            if (my $cb = $self->{post_sendfile_cb}) {
-                $cb->();
-            } else {
-                $self->http_response_sent;
-            }
+            $self->reproxy_file_done;
         } else {
             $self->watch_write(1);