Roxen.git/ server/ plugins/ protocols/ http.pike

2002-10-24

2002-10-24 00:16:39 by Martin Nilsson <mani@lysator.liu.se>

• a8677c93f43053dcc5d3030445361725bad08a35 (69 lines) (+42/-27) ^{[ Show | Annotate ]}
  Branch: Aphoto_2.0_beta3

Clone request_headers too, but this code really ought to reuse clone_me()
in prototypes.pike instead.

Improved behaviour for the Expiry and Last-Modified headers.
[1.376]

Rev: server/plugins/protocols/http.pike:1.386

2:   // Modified by Francesco Chemolli to add throttling capabilities.   // Copyright © 1996 - 2001, Roxen IS.    - constant cvs_version = "$Id: http.pike,v 1.385 2002/10/23 20:58:21 nilsson Exp $"; + constant cvs_version = "$Id: http.pike,v 1.386 2002/10/24 00:16:39 nilsson Exp $";   // #define REQUEST_DEBUG   #define MAGIC_ERROR   
1563:       if ( fstat[ST_MTIME] > misc->last_modified )    misc->last_modified = fstat[ST_MTIME]; +  }    -  if( misc->cacheable < INITIAL_CACHEABLE ) +  if( misc->cacheable < INITIAL_CACHEABLE ) {    heads["Expires"] = Roxen.http_date( predef::time(1)+misc->cacheable );    -  +  if (!misc->cacheable && !misc->last_modified) { +  // Data with immediate expiry is assumed to have been generated +  // at the same instant. +  misc->last_modified = predef::time(1); +  } +  } +  +  if (misc->last_modified)    heads["Last-Modified"] = Roxen.http_date(misc->last_modified);    -  + // werror("lm: %O\n" + // "cacheable: %O\n", + // misc->last_modified, + // misc->cacheable); +     if(since)    {    /* ({ time, len }) */    array(int) since_info = Roxen.parse_since( since ); - // werror("since: %{%O, %}\n" - // "lm: %O\n" - // "cacheable: %O\n", - // since_info, - // misc->last_modified, - // misc->cacheable); + // werror("since: %{%O, %}\n" + // "lm: %O\n" + // "cacheable: %O\n", + // since_info, + // misc->last_modified, + // misc->cacheable);    if ( ((since_info[0] >= misc->last_modified) &&    ((since_info[1] == -1) || (since_info[1] == file->len)))    // never say 'not modified' if not cacheable at all.    && (misc->cacheable != 0)    // actually ok, or... - // || ((misc->cacheable>0) - // && (since_info[0] + misc->cacheable<= predef::time(1)) - // // cacheable, and not enough time has passed. + // || ((misc->cacheable>0) + // && (since_info[0] + misc->cacheable<= predef::time(1)) + // // cacheable, and not enough time has passed.    )    {    file->error = 304;
1594:    file->data="";    }    } -  } +        if(prot != "HTTP/0.9")    {
2162:    c->pragma = pragma;       c->cookies = cookies; +  c->request_headers = request_headers;    c->my_fd = 0;    c->prot = prot;    c->clientprot = clientprot;