Roxen.git/ server/ base_server/ roxen.pike

2009-01-16

2009-01-16 14:38:32 by Martin Stjernholm <mast@lysator.liu.se>

• 4d127161e87ce24dad214379a6f664061807c53b (56 lines) (+30/-26) ^{[ Show | Annotate ]}
  Branch: 5.2

Go back to "manual" formatting of the port urls, to ensure they always
include the port.

Rev: server/base_server/roxen.pike:1.1019

6:   // Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.   // ABS and suicide systems contributed freely by Francesco Chemolli    - constant cvs_version="$Id: roxen.pike,v 1.1018 2009/01/11 18:13:42 jonasw Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.1019 2009/01/16 14:38:32 mast Exp $";      //! @appears roxen   //!
1476:   // only_this_conf is given then only ports for that configuration are   // searched.   { -  // Force string coersion to incorporate any separate base URI -  Standards.URI url2 = Standards.URI((string) url); -  url2->fragment = 0; -  url2->query = 0; -  string url_with_port = (string) url2; +  // Cannot use the uri formatter in Standards.URI here since we +  // always want the port number to be present. +  string host = url->host; +  if (has_value (host, ":")) host = "[" + host + "]"; +  string url_with_port = sprintf ("%s://%s:%d%s", url->scheme, host, url->port, +  sizeof (url->path) ? url->path : "/");       URL2CONF_MSG("URL with port: %s\n", url_with_port);   
2652:    (string) ui );    return 0;    } -  if (ui->host == "any" || ui->host == "ANY" || ui->host == "::") -  ui->host = "*"; +  if (lower_case (ui->host) == "any" || ui->host == "::") +  host = "*";    else    // FIXME: Maybe Standards.URI should do this internally? -  ui->host = lower_case (Standards.IDNA.zone_to_ascii (ui->host)); +  host = lower_case (Standards.IDNA.zone_to_ascii (ui->host));       protocol = ui->scheme; -  host = ui->host; -  if (!sizeof(host || "") || !protocols[protocol]) { +  if (host == "" || !protocols[protocol]) {    report_error(LOC_M(19,"Bad URL '%s' for server `%s'")+"\n",    (string) ui, conf->query_name());    } -  if (!ui->port) -  ui->port = protocols[protocol]->default_port; -  port = ui->port; +     -  url = (string) ui; +  port = ui->port || protocols[protocol]->default_port;    -  if (path = ui->path) -  if (sizeof(path)) { +  if (path = ui->path) {    if (has_suffix(path, "/")) -  path = path[..sizeof(path) - 2]; -  } else { -  path = 0; +  path = path[..<1]; +  if (path == "") path = 0;    }    -  +  { +  string h = has_value (host, ":") ? "[" + host + "]" : host; +  url = sprintf ("%s://%s:%d%s/", protocol, h, port, +  // If the path is set it's assumed to begin with a +  // "/", but not end with one. +  path || ""); +  } +     if( urls[ url ] )    {    if( !urls[ url ]->port )
5653:   int is_ip(string s)   {    return s && -  ((sscanf(s,"%*d.%*d.%*d.%*d")==4 && s[-1]>='0' && s[-1]<='9') || // IPv4 -  (sizeof(s/":") > 1)); // IPv6 +  (sscanf(s,"%*d.%*d.%*d.%*d%*c")==4 || // IPv4 +  has_value (s, ":")); // IPv6   }      protected string _sprintf( )