Skip to content

Fixed UPnP for full URLs with scheme #2451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ypopovych wants to merge 1 commit into
base: v0.24.x
Choose a base branch
from
+7 −2
Open

Fixed UPnP for full URLs with scheme #2451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/TagAny.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ TagScanFile(const Path path_fs, TagHandler &handler)
static std::string
ResolveUri(std::string_view base, const char *relative)
{
if (uri_has_scheme(relative)) {
return std::string(relative);
}
while (true) {
const char *rest = StringAfterPrefix(relative, "../");
if (rest == nullptr)
Expand Down
4 changes: 3 additions & 1 deletion src/db/plugins/upnp/Directory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ class UPnPDirParser final : public CommonExpatParser {
if (duration != nullptr)
tag.SetDuration(ParseDuration(duration));

object.url.clear();

state = RES;
}

Expand Down Expand Up @@ -205,7 +207,7 @@ class UPnPDirParser final : public CommonExpatParser {
break;

case RES:
object.url.assign(s);
object.url.append(s);
break;

case CLASS:
Expand Down
2 changes: 1 addition & 1 deletion src/lib/upnp/ContentDirectoryService.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ using std::string_view_literals::operator""sv;

ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device,
const UPnPService &service) noexcept
:m_actionURL(uri_apply_base(service.controlURL, device.URLBase)),
:m_actionURL(uri_apply_relative(service.controlURL, device.URLBase)),
m_serviceType(service.serviceType),
m_deviceId(device.UDN),
m_friendlyName(device.friendlyName),
Expand Down
Loading