Branch: Tag:

1997-04-05

1997-04-05 01:26:35 by Per Hedbor <ph@opera.com>

Merge med 1.1.1

Rev: server/base_server/cache.pike:1.12
Rev: server/base_server/config/builders.pike:1.6
Rev: server/base_server/config/describers.pike:1.22
Rev: server/base_server/config/draw_things.pike:1.18
Rev: server/base_server/config/low_describers.pike:1.7
Rev: server/base_server/disk_cache.pike:1.15
Rev: server/base_server/hosts.pike:1.10
Rev: server/base_server/language.pike:1.8
Rev: server/base_server/mainconfig.pike:1.37
Rev: server/base_server/module_support.pike:1.11
Rev: server/base_server/newdecode.pike:1.6
Rev: server/base_server/persistent.pike:1.18
Rev: server/base_server/privs.pike:1.7
Rev: server/base_server/proxyauth.pike:1.3
Rev: server/base_server/read_config.pike:1.9
Rev: server/base_server/roxen.pike:1.47
Rev: server/base_server/roxenlib.pike:1.20
Rev: server/base_server/roxenloader.pike:1.13
Rev: server/base_server/socket.pike:1.5
Rev: server/bin/garbagecollector.pike:1.6
Rev: server/bin/install.pike:1.10
Rev: server/etc/include/roxen.h:1.3
Rev: server/etc/include/syslog.h:1.2(DEAD)
Rev: server/etc/include/variables.h:1.3
Rev: server/etc/roxen_master.pike:1.30
Rev: server/etc/supports:1.18
Rev: server/etc/welcome.html:1.6
Rev: server/install:1.2
Rev: server/languages/german.pike:1.4
Rev: server/modules/directories/directories2.pike:1.2
Rev: server/modules/filesystems/filesystem.pike:1.12
Rev: server/modules/filesystems/userfs.pike:1.12
Rev: server/modules/filters/htaccess.pike:1.9
Rev: server/modules/filters/redirect.pike:1.8
Rev: server/modules/graphics/graphic_text.pike:1.40
Rev: server/modules/graphics/tablist.pike:1.4
Rev: server/modules/misc/contenttypes.pike:1.7
Rev: server/modules/misc/ismap.pike:1.7
Rev: server/modules/misc/userdb.pike:1.12
Rev: server/modules/proxies/connect.pike:1.6
Rev: server/modules/proxies/ftpgateway.pike:1.11
Rev: server/modules/proxies/gopher.pike:1.8
Rev: server/modules/proxies/proxy.pike:1.15
Rev: server/modules/proxies/wais.pike:1.7
Rev: server/modules/scripting/cgi.pike:1.14
Rev: server/modules/scripting/fcgi.pike:1.8
Rev: server/modules/scripting/pikescript.pike:1.10
Rev: server/modules/tags/htmlparse.pike:1.26
Rev: server/protocols/ftp.pike:1.6
Rev: server/protocols/http.pike:1.22
Rev: server/protocols/ssl.pike:1.6
Rev: server/protocols/ssl3.pike:1.2
Rev: server/protocols/ssleay.pike:1.5
Rev: server/start:1.8
Rev: server/unfinishedmodules/whois++.pike:1.4

1:   // This is a roxen module. (c) Informationsv√§varna AB 1996.    -  - string cvs_version = "$Id: http.pike,v 1.21 1997/03/26 05:54:17 per Exp $"; + string cvs_version = "$Id: http.pike,v 1.22 1997/04/05 01:26:31 per Exp $";   // HTTP protocol module.   #include <config.h>   inherit "roxenlib";
15:   constant handle=roxen->handle;   constant _query=roxen->query;   //constant This = object_program(this_object()); + import Simulate;      #define SPEED_MAX   
85:   {    if(!my_fd) return end();    if(!pipe) pipe=Pipe.pipe(); + // if(!noend) pipe->set_done_callback(end);   #ifdef REQUEST_DEBUG    perror("REQUEST: Pipe setup.\n");   #endif
385:    client = contents/" " - ({ "" });    break;    +  /* Some of M$'s non-standard user-agent info */ +  case "ua-pixels": /* Screen resolution */ +  case "ua-color": /* Color scheme */ +  case "ua-os": /* OS-name */ +  case "ua-cpu": /* CPU-type */ +  /* None of the above are interresting or usefull */ +  /* IGNORED */ +  break; +     case "referer":    referer = contents/" ";    break;
904:    c->raw_url = raw_url;   // c->do_not_disconnect = do_not_disconnect; // No use where there is no fd..    c->variables = copy_value(variables); -  c->misc = copy_value(misc); c->misc->orig = t; +  c->misc = copy_value(misc); +  c->misc->orig = t;       c->prestate = prestate;    c->supports = supports;