[asterisk-commits] pitel: branch 1.8 r287269 - /branches/1.8/res/

[SVN commits to the Asterisk project]

Author: pitel
Date: Fri Sep 17 03:37:49 2010
New Revision: 287269

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287269
Log:
Support for HTTP redirects in calendar's URL

libneon does not support HTTP redirects (3xx responses) by default. You must tell it to follow them.
Also, another little unsigned int fix.

(closes issue #17776)
Review: https://reviewboard.asterisk.org/r/921/

Modified:
    branches/1.8/res/res_calendar_caldav.c
    branches/1.8/res/res_calendar_ews.c
    branches/1.8/res/res_calendar_exchange.c
    branches/1.8/res/res_calendar_icalendar.c

Modified: branches/1.8/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_calendar_caldav.c?view=diff&rev=287269&r1=287268&r2=287269
==============================================================================
--- branches/1.8/res/res_calendar_caldav.c (original)
+++ branches/1.8/res/res_calendar_caldav.c Fri Sep 17 03:37:49 2010
@@ -34,6 +34,7 @@
 #include <ne_uri.h>
 #include <ne_request.h>
 #include <ne_auth.h>
+#include <ne_redirect.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 
@@ -643,6 +644,7 @@
 	}
 
 	pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port);
+	ne_redirect_register(pvt->session);
 	ne_set_server_auth(pvt->session, auth_credentials, pvt);
 	if (!strcasecmp(pvt->uri.scheme, "https")) {
 		ne_ssl_trust_default_ca(pvt->session);

Modified: branches/1.8/res/res_calendar_ews.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_calendar_ews.c?view=diff&rev=287269&r1=287268&r2=287269
==============================================================================
--- branches/1.8/res/res_calendar_ews.c (original)
+++ branches/1.8/res/res_calendar_ews.c Fri Sep 17 03:37:49 2010
@@ -35,6 +35,7 @@
 #include <ne_xml.h>
 #include <ne_xmlreq.h>
 #include <ne_utils.h>
+#include <ne_redirect.h>
 
 #include "asterisk/module.h"
 #include "asterisk/calendar.h"
@@ -197,7 +198,7 @@
 			return NE_XML_ABORT;
 		}
 
-		ast_debug(3, "EWS: %d calendar items to load\n", items);
+		ast_debug(3, "EWS: %u calendar items to load\n", items);
 		ctx->pvt->items = items;
 		if (items < 1) {
 			/* Stop processing XML if there are no events */
@@ -838,6 +839,7 @@
 	ast_debug(3, "secret		= %s\n", pvt->secret);
 
 	pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port);
+	ne_redirect_register(pvt->session);
 	ne_set_server_auth(pvt->session, auth_credentials, pvt);
 	ne_set_useragent(pvt->session, "Asterisk");
 

Modified: branches/1.8/res/res_calendar_exchange.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_calendar_exchange.c?view=diff&rev=287269&r1=287268&r2=287269
==============================================================================
--- branches/1.8/res/res_calendar_exchange.c (original)
+++ branches/1.8/res/res_calendar_exchange.c Fri Sep 17 03:37:49 2010
@@ -34,6 +34,7 @@
 #include <ne_uri.h>
 #include <ne_request.h>
 #include <ne_auth.h>
+#include <ne_redirect.h>
 #include <iksemel.h>
 
 #include "asterisk/module.h"
@@ -693,6 +694,7 @@
 	}
 
 	pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port);
+	ne_redirect_register(pvt->session);
 	ne_set_server_auth(pvt->session, auth_credentials, pvt);
 	if (!strcasecmp(pvt->uri.scheme, "https")) {
 		ne_ssl_trust_default_ca(pvt->session);

Modified: branches/1.8/res/res_calendar_icalendar.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_calendar_icalendar.c?view=diff&rev=287269&r1=287268&r2=287269
==============================================================================
--- branches/1.8/res/res_calendar_icalendar.c (original)
+++ branches/1.8/res/res_calendar_icalendar.c Fri Sep 17 03:37:49 2010
@@ -33,6 +33,7 @@
 #include <ne_uri.h>
 #include <ne_request.h>
 #include <ne_auth.h>
+#include <ne_redirect.h>
 
 #include "asterisk/module.h"
 #include "asterisk/calendar.h"
@@ -420,6 +421,7 @@
 	}
 
 	pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port);
+	ne_redirect_register(pvt->session);
 	ne_set_server_auth(pvt->session, auth_credentials, pvt);
 	if (!strcasecmp(pvt->uri.scheme, "https")) {
 		ne_ssl_trust_default_ca(pvt->session);