Branch: Tag:

2008-05-07

2008-05-07 10:51:30 by Martin Stjernholm <mast@lysator.liu.se>

Moved the last piece (a http status message mapping) out of variables.h and
into Roxen.pmod, and did away with variables.h includes.

Rev: server/base_server/prototypes.pike:1.213
Rev: server/base_server/roxen.pike:1.974
Rev: server/etc/include/variables.h:1.17
Rev: server/etc/modules/Roxen.pmod:1.237
Rev: server/modules/tags/sizer.pike:1.26
Rev: server/protocols/ftp.pike:2.120
Rev: server/protocols/http.pike:1.554

2:   // Modified by Francesco Chemolli to add throttling capabilities.   // Copyright © 1996 - 2004, Roxen IS.    - constant cvs_version = "$Id: http.pike,v 1.553 2008/04/28 15:13:37 mast Exp $"; + constant cvs_version = "$Id: http.pike,v 1.554 2008/05/07 10:51:30 mast Exp $";   // #define REQUEST_DEBUG   #define MAGIC_ERROR   
119:      #include <roxen.h>   #include <module.h> - #include <variables.h> +    #include <request_trace.h>      #define MY_TRACE_ENTER(A, B) \
1990:    {    NO_PROTO_CACHE();    if(misc->error_code) -  file = Roxen.http_status(misc->error_code, errors[misc->error_code]); +  file = Roxen.http_status(misc->error_code, +  Roxen.http_status_messages[misc->error_code]);    else if(err = catch {    file = conf->error_file( this_object() );    })
2076:    m_delete(heads, "Expires");       // FIXME: prot. -  head_string = sprintf(" %s\r\n", -  head_status || errors[file->error] || ""); +  head_string = sprintf(" %s\r\n", head_status || +  Roxen.http_status_messages[file->error] || "");       if (mixed err = catch(head_string += Roxen.make_http_headers(heads, 1)))    {