[asterisk-commits] oej: branch oej/videocaps r116235 - in /team/oej/videocaps: ./ channels/

[SVN commits to the Asterisk project]

Author: oej
Date: Wed May 14 08:08:39 2008
New Revision: 116235

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116235
Log:
Force automerge

Modified:
    team/oej/videocaps/   (props changed)
    team/oej/videocaps/channels/chan_sip.c

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 14 08:08:39 2008
@@ -1,1 +1,1 @@
-/trunk:1-116231
+/trunk:1-116234

Modified: team/oej/videocaps/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/channels/chan_sip.c?view=diff&rev=116235&r1=116234&r2=116235
==============================================================================
--- team/oej/videocaps/channels/chan_sip.c (original)
+++ team/oej/videocaps/channels/chan_sip.c Wed May 14 08:08:39 2008
@@ -12653,9 +12653,8 @@
 	struct ast_frame f;
 	const char *content_type = get_header(req, "Content-Type");
 
- 	if (strncmp(content_type, "text/plain", strlen("text/plain"))) { 
-	//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;