Commit 4622dc75 authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve conflicts

parent 17ff0819

ccsrc/Framework/src/params.cc

+136 −136
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void params::convert(params &p_param, const std::string p_parameters) { 
  loggers::get_instance().log(">>> params::convert: '%s'", p_parameters.c_str());

  // Extract parameters

  try {

    std::regex           rgx("(\\w+)=(.*?)(,|$)");

    std::regex           rgx("(\\w+)=(.*?)(,|$|\\))");

    std::sregex_iterator begin(p_parameters.cbegin(), p_parameters.cend(), rgx);

    std::sregex_iterator end = std::sregex_iterator();

    for (std::sregex_iterator it = begin; it != end; ++it) {

ccsrc/Protocols/Http/http_layer.cc

+248 −245
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ http_layer::http_layer(const std::string& p_type, const std::string& param) 
    const std::string from(";");

    const std::string to("\r\n");

    _params[params::headers].assign(converter::get_instance().replace(it->second, from, to));

    loggers::get_instance().log("http_layer::http_layer: _params[params::headers]='%s'", _params[params::headers].c_str());

  }

  it = _params.find(params::device_mode);

  if (it != _params.cend()) {
@@ -113,8 +114,10 @@ void http_layer::send_data(OCTETSTRING &p_data, params &params) { 
    }

    buffer.put_cs("\r\n");

    if ((it = params.find(params::headers)) != _params.cend()) {

      loggers::get_instance().log("http_layer::send_data: params[params::headers]='%s'", params[params::headers].c_str());

      buffer.put_cs(params[params::headers].c_str());

    } else if ((it = _params.find(params::headers)) != _params.cend()) {

      loggers::get_instance().log("http_layer::send_data: _params[params::headers]='%s'", _params[params::headers].c_str());

      buffer.put_cs(_params[params::headers].c_str());

    }

    buffer.put_cs("\r\n");