[svn-commits] file: branch 1.4 r57477 - in /branches/1.4: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: file
Date: Fri Mar  2 11:06:52 2007
New Revision: 57477

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57477
Log:
Merged revisions 57475 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r57475 | file | 2007-03-02 12:02:46 -0500 (Fri, 02 Mar 2007) | 2 lines

If a SIP message comes in and goes to a method handler that requires additional values that may not be present then send back an error.

........

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

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=57477&r1=57476&r2=57477
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Fri Mar  2 11:06:52 2007
@@ -14640,6 +14640,12 @@
 			}
 			return res;
 		}
+	}
+
+	if (!e && (p->method == SIP_INVITE || p->method == SIP_SUBSCRIBE || p->method == SIP_REGISTER || p->method == SIP_NOTIFY)) {
+		transmit_response(p, "503 Server error", req);
+		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
+		return -1;
 	}
 
 	/* Handle various incoming SIP methods in requests */