Hey,
I just tried to cherry-pick my really short one-char typo fix (touching
timer.h only) from master branch (commit e5d313913b34e05) into the
sr_3.0 branch when git started to scream at me because of unmerged files:
$ git cherry-pick -x e5d313913b34e05a9e0529a907b87a54ba354d26
Added pkg/kamailio/debian-lenny/changelog
Added pkg/kamailio/debian-lenny/rules
Auto-merged timer.h
pkg/kamailio/debian-lenny/compat: unmerged
(7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69)
pkg/kamailio/debian-lenny/control: unmerged
(0fcdc55bb67da3503dc1a493c67827f55b0bfe35)
pkg/kamailio/debian-lenny/copyright: unmerged
(36282d7348bb5c5cf60f3221960bf2207d74a204)
pkg/kamailio/debian-lenny/kamailio.README.Debian: unmerged
(4eaf90bf566f73dbadb98019fc162f1577e220d5)
pkg/kamailio/debian-lenny/kamailio.default: unmerged
(4317664cfed06f8819c9c1e9dd8f09cc5f190dd1)
pkg/kamailio/debian-lenny/kamailio.dirs: unmerged
(f16a2e95bfec7df65ce7031fd57e9c1709f276a6)
pkg/kamailio/debian-lenny/kamailio.examples: unmerged
(c48447a3e9c5d9dc13a410b40345c970b0e1e741)
pkg/kamailio/debian-lenny/kamailio.init: unmerged
(e5f50fcbf7a174c34a2f69ec0d74f0b448d629e4)
pkg/kamailio/debian-lenny/kamailio.postinst: unmerged
(fc7e4a8192ba5cdee9bfc14cc7b490af47b0b545)
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and
commit the result.
When commiting, use the option '-c e5d3139' to retain authorship and
message.
I'm not quite sure how to resolve this the best way. Help is appreciated.
Cheers,
--Timo
Module: sip-router
Branch: kamailio_3.0
Commit: 927351a2c4bd222db8a58b877a5fb018fdce2d00
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=927351a…
Author: Timo Reimann <timo.reimann(a)1und1.de>
Committer: Timo Reimann <timo.reimann(a)1und1.de>
Date: Thu Jun 24 15:50:52 2010 +0200
Correct typo in comment referring to other file.
---
timer.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/timer.h b/timer.h
index a14c342..b2b86bd 100644
--- a/timer.h
+++ b/timer.h
@@ -61,7 +61,7 @@ typedef void (timer_function)(unsigned int ticks, void* param);
/* deprecated, old, kept for compatibility
get_ticks()*TIMER_TICK used to be the time in s
for new code, use get_ticks_raw() and one of the macros defined in
- time_ticks.h (.e.g TICKS_TO_S(tick) to convert to s or ms )*/
+ timer_ticks.h (.e.g TICKS_TO_S(tick) to convert to s or ms )*/
#define TIMER_TICK 1 /* 1 s, kept for compatibility */
Revision: 6010
http://openser.svn.sourceforge.net/openser/?rev=6010&view=rev
Author: mariuszbihlei
Date: 2010-06-25 12:51:15 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
modules/dialog: Fix timer reset and improve timeout value logging
- Fix a bug that caused dialog timeout values to be refreshed only
when a custom timeout was provided by the user via AVP.
- Do not log failure to get timeout from AVP when in fact no AVP
was used.
- Patch by Timo Reimann (timo.reimann at 1und1.de), patch backported from sip-router
Modified Paths:
--------------
branches/1.5/modules/dialog/dlg_handlers.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.
The following task has a new comment added:
FS#77 - presence_xml with db_postgres
User who did this - Henning Westerholt (henningw)
----------
Indeed the BLOBs in db_mysql driver module are also null-terminated. This behaviour is really old, its has been this way since 0.9 times. But you're right, BLOBs normally don't need to be inserted this way. I could guess it was done in the past because BLOBs were not represented as own dedicated datatype this time, but as VAL_STR values. In 1.0 the postgres module did some null-termination, in 1.0 it was replaced and the internal (un) escaping routines were used instead.
The correct way would be probably to fix the modules that they don't rely on this anymore. But as i've no way of testing all this presence stuff, and it only saves one byte, i think we should apply this patch. Then its at least consistent to db_mysql and db_unixodbc.
----------
More information can be found at the following URL:
http://sip-router.org/tracker/index.php?do=details&task_id=77#comment89
You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.