Roxen.git/ server/ base_server/ roxen.pike

2018-06-14

2018-06-14 09:05:57 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 8c41625b55173f32e7ffe41653bdc4223a84f0ca (27 lines) (+16/-11) ^{[ Show | Annotate ]}
  Branch: 8c41625b55173f32e7ffe41653bdc4223a84f0ca

Core: Avoid generating duplicate entries in register_url().

Fixes [WS-313].

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.1081 2011/06/15 15:11:08 grubba Exp $"; + constant cvs_version="$Id$";      //! @appears roxen   //!
2956:    } else {    urls[url]->ports = ({ m[required_host][port] });    } +  if (ourl != url) {    urls[ourl]->port = m[required_host][port];    if (urls[ourl]->ports) {    urls[ourl]->ports += ({ m[required_host][port] });    } else {    urls[ourl]->ports = ({ m[required_host][port] });    } -  +  }    continue; /* No need to open a new port */    }   
3016:    } else {    urls[url]->ports = ({ prot_obj });    } +  if (ourl != url) {    urls[ ourl ]->port = prot_obj;    if (urls[ourl]->ports) {    urls[ourl]->ports += ({ prot_obj });    } else {    urls[ourl]->ports = ({ prot_obj });    } -  +  }    prot_obj->ref(url, urls[url]);       if( !prot_obj->bound )