Skip to content
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

Jump to bottom

Forward add question mark to the end. #3438

Merged
merged 3 commits into from
Feb 25, 2023
Merged

Forward add question mark to the end. #3438

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1533101
Forward add question mark to the end and Erroneous C2.
winlinvip Feb 25, 2023
5e1c9a1
Update release to v6.0.30
winlinvip Feb 25, 2023
0b807e5
fix error
mapengfei53 Feb 25, 2023
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
1 change: 1 addition & 0 deletions trunk/doc/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The changelog for SRS.

## SRS 6.0 Changelog

* v6.0, 2023-02-25, Merge [#3438](https://github.com/ossrs/srs/pull/3438): Forward add question mark to the end. v6.0.30 (#3438)
* v6.0, 2023-02-25, Merge [#3416](https://github.com/ossrs/srs/pull/3416): GB: Support HEVC for regression test and load tool for GB. v6.0.29 (#3416)
* v6.0, 2023-02-25, Merge [#3424](https://github.com/ossrs/srs/pull/3424): API: Add service_id for http_hooks, which identify the process. v6.0.28 (#3424)
* v6.0, 2023-02-22, Compatible with legacy RTMP URL. v6.0.27
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version6.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 6
#define VERSION_MINOR 0
#define VERSION_REVISION 29
#define VERSION_REVISION 30

#endif
2 changes: 1 addition & 1 deletion trunk/src/protocol/srs_protocol_utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ string srs_generate_stream_with_query(string host, string vhost, string stream,
}

// Remove the start & when param is empty.
query = srs_string_trim_start(query, "&");
query = srs_string_trim_start(query, "&?");

// Prefix query with ?.
if (!query.empty() && !srs_string_starts_with(query, "?")) {
Expand Down
28 changes: 28 additions & 0 deletions trunk/src/utest/srs_utest_rtmp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3049,6 +3049,34 @@ VOID TEST(ProtocolRTMPTest, GenerateURL)
}
}

VOID TEST(ProtocolRTMPTest, GenerateURLForFFmpeg)
{
// For https://github.com/ossrs/srs/issues/3405
if (true) {
string host("192.168.1.100"), vhost("localhost"), stream("stream"), param("?vhost=localhost");
string url = srs_generate_stream_with_query(host, vhost, stream, param, false);
EXPECT_STREQ("stream", url.c_str());
}

if (true) {
string host("192.168.1.100"), vhost("localhost"), stream("stream"), param("?k=v&vhost=localhost");
string url = srs_generate_stream_with_query(host, vhost, stream, param, false);
EXPECT_STREQ("stream?k=v", url.c_str());
}

if (true) {
string host("192.168.1.100"), vhost("localhost"), stream("stream"), param("?vhost=localhost&k=v");
string url = srs_generate_stream_with_query(host, vhost, stream, param, false);
EXPECT_STREQ("stream?k=v", url.c_str());
}

if (true) {
string host("192.168.1.100"), vhost("localhost"), stream("stream"), param("?k=v");
string url = srs_generate_stream_with_query(host, vhost, stream, param, false);
EXPECT_STREQ("stream?k=v", url.c_str());
}
}

VOID TEST(ProtocolRTMPTest, DiscoveryTcUrlLegacy)
{
if (true) {
Expand Down