<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<p>You can backport if you need it now (as well as other related
patches) -- if not, I will do it in few days, as I will prepare
the next release in branch 5.0.</p>
<p><br>
</p>
Cheers,<br>
Daniel<br>
<br>
<div class="moz-cite-prefix">On 19.05.17 17:11, Luis Azedo wrote:<br>
</div>
<blockquote
cite="mid:DM5PR13MB1643D81BA3117F53A83E46F1A0E50@DM5PR13MB1643.namprd13.prod.outlook.com"
type="cite">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Exchange Server">
<!-- converted from text -->
<style><!-- .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left: #800000 2px solid; } --></style>
<meta content="text/html; charset=UTF-8">
<style type="text/css" style="">
<!--
p
{margin-top:0;
margin-bottom:0}
-->
</style>
<div dir="ltr">
<div id="x_divtagdefaultwrapper" dir="ltr"
style="font-size:12pt; color:#000000;
font-family:Calibri,Arial,Helvetica,sans-serif">
<p>sorry,</p>
<p>thought the new <span>ksr_msg_env_reset was already
backported.</span></p>
<p><span><br>
</span></p>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="x_divRplyFwdMsg" dir="ltr"><font style="font-size:11pt"
color="#000000" face="Calibri, sans-serif"><b>From:</b>
sr-dev <a class="moz-txt-link-rfc2396E" href="mailto:sr-dev-bounces@lists.kamailio.org"><sr-dev-bounces@lists.kamailio.org></a> on behalf
of Luis Azedo <a class="moz-txt-link-rfc2396E" href="mailto:luis@2600hz.com"><luis@2600hz.com></a><br>
<b>Sent:</b> Friday, May 19, 2017 4:10:18 PM<br>
<b>To:</b> <a class="moz-txt-link-abbreviated" href="mailto:sr-dev@lists.kamailio.org">sr-dev@lists.kamailio.org</a><br>
<b>Subject:</b> [sr-dev] <a class="moz-txt-link-freetext" href="git:5.0:1293dc52">git:5.0:1293dc52</a>: Revert "kazoo:
add ksr_msg_env_reset after processing events"</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt;">
<div class="PlainText">Module: kamailio<br>
Branch: 5.0<br>
Commit: 1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5<br>
URL: <a moz-do-not-send="true"
href="https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5">https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5</a><br>
<br>
Author: Luis Azedo <a class="moz-txt-link-rfc2396E" href="mailto:luis@2600hz.com"><luis@2600hz.com></a><br>
Committer: Luis Azedo <a class="moz-txt-link-rfc2396E" href="mailto:luis@2600hz.com"><luis@2600hz.com></a><br>
Date: 2017-05-19T16:10:00+01:00<br>
<br>
Revert "kazoo: add ksr_msg_env_reset after processing
events"<br>
<br>
This reverts commit
a5e68b5697688f82edbc48e64f32e15f89c8b357.<br>
<br>
---<br>
<br>
Modified: src/modules/kazoo/kz_amqp.c<br>
<br>
---<br>
<br>
Diff: <a moz-do-not-send="true"
href="https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.diff">https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.diff</a><br>
Patch: <a moz-do-not-send="true"
href="https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.patch">https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.patch</a><br>
<br>
---<br>
<br>
diff --git a/src/modules/kazoo/kz_amqp.c
b/src/modules/kazoo/kz_amqp.c<br>
index ca3a86a19c..da310893c9 100644<br>
--- a/src/modules/kazoo/kz_amqp.c<br>
+++ b/src/modules/kazoo/kz_amqp.c<br>
@@ -42,10 +42,6 @@<br>
#include "../../core/mod_fix.h"<br>
#include "../../core/lvalue.h"<br>
#include "../tm/tm_load.h"<br>
-#include "../../core/route.h"<br>
-#include "../../core/receive.h"<br>
-#include "../../core/action.h"<br>
-#include "../../core/script_cb.h"<br>
<br>
<br>
#include "kz_amqp.h"<br>
@@ -2284,14 +2280,11 @@ int kz_amqp_consumer_fire_event(char
*eventkey)<br>
fmsg = faked_msg_get_next();<br>
rtb = get_route_type();<br>
set_route_type(REQUEST_ROUTE);<br>
- if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) {<br>
- init_run_actions_ctx(&ctx);<br>
- run_top_route(event_rt.rlist[rt], fmsg, 0);<br>
- exec_post_script_cb(fmsg, REQUEST_CB_TYPE);<br>
- ksr_msg_env_reset();<br>
- }<br>
+ init_run_actions_ctx(&ctx);<br>
+ run_top_route(event_rt.rlist[rt], fmsg, 0);<br>
set_route_type(rtb);<br>
return 0;<br>
+<br>
}<br>
<br>
void kz_amqp_consumer_event(char *payload, char* event_key,
char* event_subkey)<br>
@@ -2415,7 +2408,6 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr
cmd)<br>
}<br>
struct action *a = main_rt.rlist[n];<br>
tmb.t_continue(cmd->t_hash, cmd->t_label, a);<br>
- ksr_msg_env_reset();<br>
}<br>
<br>
void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd)<br>
@@ -2427,7 +2419,6 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr
cmd)<br>
}<br>
struct action *a = main_rt.rlist[n];<br>
tmb.t_continue(cmd->t_hash, cmd->t_label, a);<br>
- ksr_msg_env_reset();<br>
}<br>
<br>
int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)<br>
<br>
<br>
_______________________________________________<br>
Kamailio (SER) - Development Mailing List<br>
<a class="moz-txt-link-abbreviated" href="mailto:sr-dev@lists.kamailio.org">sr-dev@lists.kamailio.org</a><br>
<a moz-do-not-send="true"
href="https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev">https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev</a><br>
</div>
</span></font>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Kamailio (SER) - Development Mailing List
<a class="moz-txt-link-abbreviated" href="mailto:sr-dev@lists.kamailio.org">sr-dev@lists.kamailio.org</a>
<a class="moz-txt-link-freetext" href="https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev">https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
Daniel-Constantin Mierla
<a class="moz-txt-link-abbreviated" href="http://www.twitter.com/miconda">www.twitter.com/miconda</a> -- <a class="moz-txt-link-abbreviated" href="http://www.linkedin.com/in/miconda">www.linkedin.com/in/miconda</a>
Kamailio Advanced Training - May 22-24 (USA) - <a class="moz-txt-link-abbreviated" href="http://www.asipto.com">www.asipto.com</a>
Kamailio World Conference - May 8-10, 2017 - <a class="moz-txt-link-abbreviated" href="http://www.kamailioworld.com">www.kamailioworld.com</a></pre>
</body>
</html>