mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 14:58:34 +00:00
merge changes from current sofia-sip tree.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4153 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
7f8c4decad
commit
cad28828b2
212 files changed
+36821
-13381
No files matched your search
@@ -104,6 +104,7 @@ CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
|
||||
ALLOCA = @ALLOCA@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
@@ -150,8 +151,12 @@ HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
|
||||
HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
|
||||
HAVE_MINGW32_FALSE = @HAVE_MINGW32_FALSE@
|
||||
HAVE_MINGW32_TRUE = @HAVE_MINGW32_TRUE@
|
||||
HAVE_NTH_FALSE = @HAVE_NTH_FALSE@
|
||||
HAVE_NTH_TRUE = @HAVE_NTH_TRUE@
|
||||
HAVE_NTLM_FALSE = @HAVE_NTLM_FALSE@
|
||||
HAVE_NTLM_TRUE = @HAVE_NTLM_TRUE@
|
||||
HAVE_STUN_FALSE = @HAVE_STUN_FALSE@
|
||||
HAVE_STUN_TRUE = @HAVE_STUN_TRUE@
|
||||
HAVE_TLS_FALSE = @HAVE_TLS_FALSE@
|
||||
HAVE_TLS_TRUE = @HAVE_TLS_TRUE@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
@@ -195,6 +200,7 @@ REPLACE_LIBADD = @REPLACE_LIBADD@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SOFIA_CFLAGS = @SOFIA_CFLAGS@
|
||||
SOFIA_COVERAGE = @SOFIA_COVERAGE@
|
||||
SOFIA_GLIB_PKG_REQUIRES = @SOFIA_GLIB_PKG_REQUIRES@
|
||||
STRIP = @STRIP@
|
||||
TESTS_ENVIRONMENT = @TESTS_ENVIRONMENT@
|
||||
|
||||
@@ -331,7 +331,7 @@ int main(int argc, char *argv[])
|
||||
return context->c_retval;
|
||||
}
|
||||
|
||||
/** Handle responses to registration request */
|
||||
/** Handle responses to OPTIONS request */
|
||||
static
|
||||
int response_to_options(context_t *context,
|
||||
nta_outgoing_t *oreq,
|
||||
@@ -355,12 +355,16 @@ int response_to_options(context_t *context,
|
||||
sip_is_content_length(h))
|
||||
continue;
|
||||
}
|
||||
if (h->sh_class->hc_name) {
|
||||
snprintf(hname, sizeof hname, "%s: %%s\n", h->sh_class->hc_name);
|
||||
sl_header_print(stdout, hname, h);
|
||||
|
||||
if (h->sh_class->hc_name == NULL) {
|
||||
sl_header_print(stdout, NULL, h);
|
||||
}
|
||||
else if (h->sh_class->hc_name[0] == '\0') {
|
||||
sl_header_print(stdout, "%s\n", h);
|
||||
}
|
||||
else {
|
||||
sl_header_print(stdout, NULL, h);
|
||||
snprintf(hname, sizeof hname, "%s: %%s\n", h->sh_class->hc_name);
|
||||
sl_header_print(stdout, hname, h);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user