Author: wdoekes Date: Sun Oct 12 02:42:00 2014 New Revision: 425287 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425287 Log: res_calendar_ews: Relax neon version check to work with 0.30 too.
Allow res_calendar_ews to work not only with libneon-0.29 but also with 0.30. ASTERISK-24325 #close Reported by: Tzafrir Cohen Review: https://reviewboard.asterisk.org/r/4068/ ........ Merged revisions 425286 from http://svn.asterisk.org/svn/asterisk/branches/1.8 Modified: branches/11/ (props changed) branches/11/res/res_calendar_ews.c Propchange: branches/11/ ------------------------------------------------------------------------------ Binary property 'branch-1.8-merged' - no diff available. Modified: branches/11/res/res_calendar_ews.c URL: http://svnview.digium.com/svn/asterisk/branches/11/res/res_calendar_ews.c?view=diff&rev=425287&r1=425286&r2=425287 ============================================================================== --- branches/11/res/res_calendar_ews.c (original) +++ branches/11/res/res_calendar_ews.c Sun Oct 12 02:42:00 2014 @@ -906,8 +906,17 @@ static int load_module(void) { /* Actualy, 0.29.1 is required (because of NTLM authentication), but this - * function does not support matching patch version. */ - if (ne_version_match(0, 29)) { + * function does not support matching patch version. + * + * The ne_version_match function returns non-zero if the library + * version is not of major version major, or the minor version + * is less than minor. For neon versions 0.x, every minor + * version is assumed to be incompatible with every other minor + * version. + * + * I.e. for version 1.2..1.9 we would do ne_version_match(1, 2) + * but for version 0.29 and 0.30 we need two checks. */ + if (ne_version_match(0, 29) && ne_version_match(0, 30)) { ast_log(LOG_ERROR, "Exchange Web Service calendar module require neon >= 0.29.1, but %s is installed.\n", ne_version_string()); return AST_MODULE_LOAD_DECLINE; } -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
