mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-30 17:59:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev_content_cpp' into dev_chatroom_list_subscription

Browse source
This commit is contained in:
Benjamin Reis 2018-03-21 16:10:24 +01:00
commit 838f597e08
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/content/content-type.cpp
View file

@ -76,7 +76,7 @@ ContentType::ContentType (const string &contentType) : ClonableObject(*new Conte
string token;
do {
posParam = params.find(";");
if (posParam != string::npos) {
if (posParam == string::npos) {
token = params;
} else {
token = params.substr(0, posParam);

15
src/content/header-param.cpp
View file

@ -42,11 +42,12 @@ HeaderParam::HeaderParam (const string &param) : ClonableObject(*new HeaderParam
size_t pos = param.find("=");
size_t end = param.length();
if (pos == string::npos)
return;
setName(param.substr(0, pos));
setValue(param.substr(pos + 1, end));
if (pos == string::npos) {
setName(param);
} else {
setName(param.substr(0, pos));
setValue(param.substr(pos + 1, end - (pos + 1)));
}
}
HeaderParam::HeaderParam (const string &name, const string &value) : ClonableObject(*new HeaderParamPrivate) {
@ -98,7 +99,9 @@ bool HeaderParam::setValue (const string &value) {
string HeaderParam::asString () const {
L_D();
string asString = ";" + d->name + "=" + d->value;
string asString = ";" + d->name;
if (!d->value.empty())
asString += "=" + d->value;
return asString;
}