Roxen.git/ server/ protocols/ http.pike

1997-03-02

1997-03-02 09:52:44 by Per Hedbor <ph@opera.com>

• 82f519a018c76dcbbdad1009c01b6c2433ca269d (15 lines) (+8/-7) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixes for the latest pike...

Rev: server/base_server/roxen.pike:1.42
Rev: server/base_server/roxenloader.pike:1.10
Rev: server/modules/proxies/proxy.pike:1.13
Rev: server/protocols/http.pike:1.20
Rev: server/start:1.7

1:   // This is a roxen module. (c) Informationsvävarna AB 1996.       - string cvs_version = "$Id: http.pike,v 1.19 1997/02/27 12:06:17 marcus Exp $"; + string cvs_version = "$Id: http.pike,v 1.20 1997/03/02 09:52:44 per Exp $";   // HTTP protocol module.   #include <config.h>   inherit "roxenlib";
640:    if(err==-1) return;    internal_error(err);    } +     if(!mappingp(file))    {    if(method != "GET" && method != "HEAD" && method != "POST")
769:    if(conf)    conf->sent+=(file->len>0 ? file->len : 1000);    +     if(!file->data &&    (file->len<=0 || (file->len > 30000))   #ifdef KEEP_CONNECTION_ALIVE
790:   #endif    file->len >= 0)    { - // perror("fo\n"); +     if(file->data)    head_string += file->data;    if(file->file)
800:    }    if(conf) conf->log(file, thiso);    end(head_string); - // perror("end\n"); +     return;    }    }    - // perror("Last case...\n"); +     if(head_string) send(head_string);    if(file->data) send(file->data);    if(file->file) send(file->file);