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

2015-09-28

2015-09-28 11:44:57 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 98f1356f178e81036019084adca6a61b46c76e87 (7 lines) (+6/-1) ^{[ Show | Annotate ]}
  Branch: 98f1356f178e81036019084adca6a61b46c76e87

Pike 8.0: More Roxen.fix_relative() fixes. Fixes [bug 7566 (#7566)].

fix_relative("//foo.menu") expanded to "//foo.menu/" rather than
the expected identity operation.

3221:    uri = Standards.URI(id->not_query, uri);    }    uri = Standards.URI(file, uri); +  if (uri->path != "") { +  // NB: Without the above test "" will expand to "/". +  // cf [bug 7566].    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, "://") &&