[svn-commits] oej: branch 1.6.0 r116236 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: oej
Date: Wed May 14 08:13:18 2008
New Revision: 116236

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116236
Log:
Merged revisions 116234 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r116234 | oej | 2008-05-14 15:05:15 +0200 (Ons, 14 Maj 2008) | 11 lines

Merged revisions 116230 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r116230 | oej | 2008-05-14 14:51:06 +0200 (Ons, 14 Maj 2008) | 3 lines

Accept text messages even with
Content-Type: text/plain;charset=Södermanländska

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=116236&r1=116235&r2=116236
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed May 14 08:13:18 2008
@@ -11575,8 +11575,8 @@
 	struct ast_frame f;
 	const char *content_type = get_header(req, "Content-Type");
 
-	if (strcmp(content_type, "text/plain")) { /* No text/plain attachment */
-		transmit_response(p, "415 Unsupported Media Type", req); 
+	if (strncmp(content_type, "text/plain", strlen("text/plain"))) { /* No text/plain attachment */
+		transmit_response(p, "415 Unsupported Media Type", req); /* Good enough, or? */
 		if (!p->owner)
 			sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
 		return;