Merge branch 'master' of git.linphone.org:linphone

diff --combined coreapi/sal_eXosip2.c
index b98a9464061c27cf87bf31cc87d8fb930a9a5257,fdaa639b204490fbc7b924fba3b1b364baa267a6..076839a1077cf87d831f8d2903693baf6c68000b
--- 1/coreapi/sal_eXosip2.c
--- 2/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@@ -462,6 -462,7 +462,7 @@@ void sal_set_root_ca(Sal* ctx, const ch
        if (ctx->rootCa)
                ms_free(ctx->rootCa);
        ctx->rootCa = ms_strdup(rootCa);
+       set_tls_options(ctx);
  }
  
  void sal_verify_server_certificates(Sal *ctx, bool_t verify){
@@@ -1952,8 -1953,7 +1953,8 @@@ static bool_t registration_failure(Sal 
  
  static void other_request_reply(Sal *sal,eXosip_event_t *ev){
        SalOp *op=find_op(sal,ev);
 -
 +      LinphoneChatMessage* chat_msg;
 +      ms_message("Processing reponse status [%i] for method [%s]",ev->response->status_code,osip_message_get_method(ev->request));
        if (op==NULL){
                ms_warning("other_request_reply(): Receiving response to unknown request.");
                return;
@@@ -1962,16 -1962,6 +1963,16 @@@
                update_contact_from_response(op,ev->response);
                if (ev->request && strcmp(osip_message_get_method(ev->request),"OPTIONS")==0)
                        sal->callbacks.ping_reply(op);
 +              else if (ev->request && strcmp(osip_message_get_method(ev->request),"MESSAGE")==0) {
 +                      /*out of call message acknolegment*/
 +                      chat_msg=(LinphoneChatMessage* )op->base.user_pointer;
 +                      if (chat_msg->cb) {
 +                              chat_msg->cb(chat_msg
 +                                                       ,(ev->response->status_code==200?LinphoneChatMessageStateDelivered:LinphoneChatMessageStateNotDelivered)
 +                                                       ,chat_msg->cb_ud);
 +                      }
 +                      linphone_chat_message_destroy(chat_msg);
 +              }
        }
  }