Roxen.git/ server/ etc/ modules/ Roxen.pmod

2010-12-02

2010-12-02 13:07:25 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• cb3e2bdc4b1b16ba52098885cb0bf7c0763f37c7 (16 lines) (+11/-5) ^{[ Show | Annotate ]}
  Branch: 5.2

fix_relative() now supports being called without a RequestID. Fixes [bug 5808 (#5808)].

fix_relative() may apparently be called with an UNDEFINED RequestID.
eg from make_absolute_url(). Make sure to support this explicitly.

Rev: server/etc/modules/Roxen.pmod:1.302

1:   // This is a roxen pike module. Copyright © 1999 - 2009, Roxen IS.   // - // $Id: Roxen.pmod,v 1.301 2010/12/02 12:15:56 grubba Exp $ + // $Id: Roxen.pmod,v 1.302 2010/12/02 13:07:25 grubba Exp $      #include <roxen.h>   #include <config.h>
2950:    return val;   }    - string fix_relative( string file, RequestID id ) + string fix_relative( string file, RequestID|void id )   //! Using @expr{@[id]->not_query@}, turns a relative (or already   //! absolute) virtual path into an absolute virtual path, i.e. one   //! rooted at the virtual server's root directory. The returned path   //! is simplified to not contain any @expr{"."@} or @expr{".."@}   //! segments.   { -  Standards.URI uri = Standards.URI(file, Standards.URI(id->not_query, "://")); +  Standards.URI uri = Standards.URI("://"); +  if (id) { +  uri = Standards.URI(id->not_query, uri); +  } +  uri = Standards.URI(file, uri);    uri->path = (uri->combine_uri_path("", uri->path)/"/" - ({ ".." })) * "/";    string res = sprintf("%s", uri);    // +(id->misc->path_info?id->misc->path_info:"");    if (has_prefix(res, "://") && !has_prefix(file, "://") && -  !has_prefix(id->not_query, "://")) { +  (!id || !has_prefix(id->not_query, "://"))) {    // No scheme. -  if (!has_prefix(file, "//") && !has_prefix(id->not_query, "//")) { +  if (!has_prefix(file, "//") && +  (!id || !has_prefix(id->not_query, "//"))) {    // No host.    return res[sizeof("://")..];    }