Changeset 709

Show
Ignore:
Timestamp:
05/11/06 15:56:51
Author:
ko
Message:

changed host name from config file to server->{sockaddr}

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/feature-server/plagger/lib/Plagger/Plugin/Server/Engine/PreFork.pm

    r705 r709  
    5151        if ($server->{proto} eq $protocol->proto && 
    5252            $server->{sockport} eq $protocol->conf->{port} && 
    53             $server->{sockaddr} eq $protocol->conf->{host}) { 
     53            ($server->{sockaddr} eq $protocol->conf->{host} || !$protocol->conf->{host})) { 
    5454            $self->log(debug => "input."); 
    5555 

  • branches/feature-server/plagger/lib/Plagger/Plugin/Server/Protocol/HTTP.pm

    r706 r709  
    5353    } 
    5454 
    55     my $host = $self->headers_in->{Host} ||= sprintf("%s:%s", $self->conf->{host}, $self->conf->{port}); 
     55    my $host = $self->headers_in->{Host} ||= sprintf("%s:%s", $req->server->{sockaddr}, $self->conf->{port}); 
    5656    $self->uri(URI->new("http://$host$query")); 
    5757    $self->cgi(CGI->new($self->uri->query)); 

  • branches/feature-server/plagger/lib/Plagger/Plugin/Server/Protocol/POP3.pm

    r702 r709  
    4343    $self->req(shift); 
    4444 
    45     $self->apopkey(sprintf("<%d.%d.%d\@%s>", time, $$, int(rand(100000)), $self->conf->{host})); 
     45    $self->apopkey(sprintf("<%d.%d.%d\@%s>", time, $$, int(rand(100000)), $self->req->server->{sockaddr})); 
    4646    printf("+OK Plagger/%s server ready. %s\r\n", $Plagger::VERSION, $self->apopkey); 
    4747 

  • branches/feature-server/plagger/lib/Plagger/Plugin/Server/Protocol/SMTP.pm

    r702 r709  
    2424    my $req = shift; 
    2525 
    26     printf("220 %s SMTP Plagger %s; %s\r\n", $self->conf->{host}, $Plagger::VERSION, HTTP::Date::time2str); 
     26    printf("220 %s SMTP Plagger %s; %s\r\n", $req->server->{sockaddr}, $Plagger::VERSION, HTTP::Date::time2str); 
    2727 
    2828    my $data_mode = 0; 
    …… 
    4848            my $host = $1; 
    4949            $host =~ s/[^\w\d\-\_\.]//g; 
    50             printf("250 %s Hello %s [%s] (may be forged), pleased to meet you\r\n", $self->conf->{host}, $host, $host); 
     50            printf("250 %s Hello %s [%s] (may be forged), pleased to meet you\r\n", $req->server->{sockaddr}, $host, $host); 
    5151        } elsif (/^MAIL FROM:(.+)\r\n$/i) { 
    5252            $self->mail_from($1); 
    …… 
    5959            $data_mode = 1; 
    6060        } elsif (/^QUIT.*\r\n$/i) { 
    61             printf("221 2.0.0 %s closing connection\r\n", $self->conf->{host}); 
     61            printf("221 2.0.0 %s closing connection\r\n", $req->server->{sockaddr}); 
    6262            last; 
    6363        } else {