Hello,<br><br>Yes, I know about cherry-pick, before commit - I've checked, there is a differences between 4.x and 3.3. I just did not want to touch them all.<br>I just corrected a problem in a limited area code.<br><br>
Anyways, thanks for tips.<br><br><div class="gmail_quote">2013/2/25 Daniel-Constantin Mierla <span dir="ltr"><<a href="mailto:miconda@gmail.com" target="_blank">miconda@gmail.com</a>></span><br><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Hello,<br>
<br>
just wanted to point that if you do a backport, the preferred way is to use:<br>
<br>
git cherry-pick -x _COMMITHASH_<br>
<br>
like:<br>
<br>
git cherry-pick -x fdf285621eee4f5c78def8ca824a9f<u></u>8d53dd286b<br>
<br>
This might not be possible for everything (e.g., modules that were relocated from modules_k/ to modules/), but have it in mind to use it whenever possible. Using cherry-pick is easier to spot backported commits, because of reference by commit id.<br>
<br>
Cheers,<br>
Daniel<div class="HOEnZb"><div class="h5"><br>
<br>
On 2/25/13 2:42 PM, Konstantin Mosesov wrote:<br>
<blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Module: sip-router<br>
Branch: 3.3<br>
Commit: fdf285621eee4f5c78def8ca824a9f<u></u>8d53dd286b<br>
URL: <a href="http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fdf285621eee4f5c78def8ca824a9f8d53dd286b" target="_blank">http://git.sip-router.org/cgi-<u></u>bin/gitweb.cgi/sip-router/?a=<u></u>commit;h=<u></u>fdf285621eee4f5c78def8ca824a9f<u></u>8d53dd286b</a><br>
<br>
Author: Konstantin Mosesov <<a href="mailto:ez@voipgroup.org.ua" target="_blank">ez@voipgroup.org.ua</a>><br>
Committer: Konstantin Mosesov <<a href="mailto:ez@voipgroup.org.ua" target="_blank">ez@voipgroup.org.ua</a>><br>
Date: Mon Feb 25 15:35:19 2013 +0200<br>
<br>
app_python: Bugfix for rewrite_ruri (backport from 4.x)<br>
<br>
*) Fixed a bug in msg_rewrite_ruri discovered by "V Tone" <<a href="mailto:vtone001@gmail.com" target="_blank">vtone001@gmail.com</a>>.<br>
*) Removed 'python exception' when do_action returns error. Reason: it is not an exception.<br>
*) Removed abort() if first_line type is invalid.<br>
<br>
---<br>
<br>
modules/app_python/python_<u></u>msgobj.c | 9 +++++----<br>
1 files changed, 5 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/modules/app_python/python_<u></u>msgobj.c b/modules/app_python/python_<u></u>msgobj.c<br>
index 3e4a2cd..0cec77c 100644<br>
--- a/modules/app_python/python_<u></u>msgobj.c<br>
+++ b/modules/app_python/python_<u></u>msgobj.c<br>
@@ -106,14 +106,13 @@ msg_rewrite_ruri(msgobject *self, PyObject *args)<br>
memset(&act, '\0', sizeof(act));<br>
act.type = SET_URI_T;<br>
- act.val[0].type = STR_ST;<br>
+ act.val[0].type = STRING_ST;<br>
act.val[0].u.str.s = ruri;<br>
act.val[0].u.str.len = strlen(ruri);<br>
init_run_actions_ctx(&ra_ctx);<br>
if (do_action(&ra_ctx, &act, self->msg) < 0) {<br>
LM_ERR("Error in do_action\n");<br>
- PyErr_SetString(PyExc_<u></u>RuntimeError, "Error in do_action\n");<br>
}<br>
Py_INCREF(Py_None);<br>
@@ -312,6 +311,7 @@ msg_getType(msgobject *self, PyObject *unused)<br>
}<br>
switch ((self->msg->first_line).type) {<br>
+<br>
case SIP_REQUEST:<br>
rval = "SIP_REQUEST";<br>
break;<br>
@@ -321,8 +321,9 @@ msg_getType(msgobject *self, PyObject *unused)<br>
break;<br>
default:<br>
- /* Shouldn't happen */<br>
- abort();<br>
+ rval = "SIP_INVALID";<br>
+ break;<br>
+<br>
}<br>
return PyString_FromString(rval);<br>
}<br>
<br>
<br>
______________________________<u></u>_________________<br>
sr-dev mailing list<br>
<a href="mailto:sr-dev@lists.sip-router.org" target="_blank">sr-dev@lists.sip-router.org</a><br>
<a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" target="_blank">http://lists.sip-router.org/<u></u>cgi-bin/mailman/listinfo/sr-<u></u>dev</a><br>
</blockquote>
<br>
<br></div></div><span class="HOEnZb"><font color="#888888">
-- <br>
Daniel-Constantin Mierla - <a href="http://www.asipto.com" target="_blank">http://www.asipto.com</a><br>
<a href="http://twitter.com/#%21/miconda" target="_blank">http://twitter.com/#!/miconda</a> - <a href="http://www.linkedin.com/in/miconda" target="_blank">http://www.linkedin.com/in/<u></u>miconda</a><br>
Kamailio World Conference, April 16-17, 2013, Berlin<br>
- <a href="http://conference.kamailio.com" target="_blank">http://conference.kamailio.com</a> -</font></span><div class="HOEnZb"><div class="h5"><br>
<br>
<br>
______________________________<u></u>_________________<br>
sr-dev mailing list<br>
<a href="mailto:sr-dev@lists.sip-router.org" target="_blank">sr-dev@lists.sip-router.org</a><br>
<a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" target="_blank">http://lists.sip-router.org/<u></u>cgi-bin/mailman/listinfo/sr-<u></u>dev</a><br>
</div></div></blockquote></div><br>