[svn-commits] russell: branch group/chan_unistim r88331 - in /team/group/chan_unistim: ./ c...

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Nov  2 15:37:47 2007
New Revision: 88331

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88331
Log:
sync with trunk

Modified:
    team/group/chan_unistim/   (props changed)
    team/group/chan_unistim/channels/chan_sip.c
    team/group/chan_unistim/doc/tex/Makefile

Propchange: team/group/chan_unistim/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/chan_unistim/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov  2 15:37:47 2007
@@ -1,1 +1,1 @@
-/trunk:1-88299
+/trunk:1-88330

Modified: team/group/chan_unistim/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/chan_unistim/channels/chan_sip.c?view=diff&rev=88331&r1=88330&r2=88331
==============================================================================
--- team/group/chan_unistim/channels/chan_sip.c (original)
+++ team/group/chan_unistim/channels/chan_sip.c Fri Nov  2 15:37:47 2007
@@ -12341,7 +12341,12 @@
 		ast_debug(1, "Got a Request to Record the channel, state %s\n", c);
 		transmit_response(p, "200 OK", req);
 		return;
-	}
+	} else if (ast_strlen_zero(c = get_header(req, "Content-Length")) || !strcasecmp(c, "0")) {
+		/* This is probably just a packet making sure the signalling is still up, just send back a 200 OK */
+		transmit_response(p, "200 OK", req);
+		return;
+	}
+
 	/* Other type of INFO message, not really understood by Asterisk */
 	/* if (get_msg_text(buf, sizeof(buf), req)) { */
 

Modified: team/group/chan_unistim/doc/tex/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/chan_unistim/doc/tex/Makefile?view=diff&rev=88331&r1=88330&r2=88331
==============================================================================
--- team/group/chan_unistim/doc/tex/Makefile (original)
+++ team/group/chan_unistim/doc/tex/Makefile Fri Nov  2 15:37:47 2007
@@ -15,7 +15,7 @@
 	@echo "** located at asterisk.pdf.                ***"	
 	@echo "**********************************************"
 	@cp asterisk.tex asterisk.tex.orig
-	@sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' asterisk.tex
+	sed -i -e 's/ASTERISKVERSION/$(shell echo $(ASTERISKVERSION) | sed -e 's/\//\\\//g')/' asterisk.tex
 	@$(RUBBER) --pdf asterisk.tex
 	@mv asterisk.tex.orig asterisk.tex
 endif