[asterisk-commits] kmoore: trunk r405744 - in /trunk: ./ res/res_pjsip.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Jan 16 13:33:28 2014
New Revision: 405744

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405744
Log:
PJSIP: Fix outbound OPTIONS support

When path support was added and contacts were made available during
request creation and transmission, the code path used by outbound
qualify support was not modified correctly and was causing request
creation to fail. This ensures that outbound request creation with only
a contact and no dialog, endpoint, or uri can succeed which restores
qualify support.

Reported by: gtjoseph
Reported by: kharwell
........

Merged revisions 405743 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=405744&r1=405743&r2=405744
==============================================================================
--- trunk/res/res_pjsip.c (original)
+++ trunk/res/res_pjsip.c Thu Jan 16 13:33:28 2014
@@ -1629,7 +1629,7 @@
 	pjsip_tpselector selector = { .type = PJSIP_TPSELECTOR_NONE, };
 
 	if (ast_strlen_zero(uri)) {
-		if (!endpoint) {
+		if (!endpoint && !contact) {
 			ast_log(LOG_ERROR, "An endpoint and/or uri must be specified\n");
 			return -1;
 		}