From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 23 Apr 2008 20:49:18 +0000 (+0000)
Subject: Fix an issue that caused getting the correct next channel to not always work.
X-Git-Tag: 1.4.20-rc1~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74694c686d9edc99bab6ef8db65f38809cefc7f4;p=thirdparty%2Fasterisk.git

Fix an issue that caused getting the correct next channel to not always work.
Also, remove setting the amount of time to wait for a digit from 5 seconds back
down to 1/10 of a second.  I believe this was so the beep didn't get played over
and over really fast, but a while back I put in another fix for that issue.

(closes issue #12498)
Reported by: jsmith
Patches:
      app_chanspy_channel_walk.trunk.patch uploaded by jsmith (license 15)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index bd66f7dc59..159fdb954b 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -598,12 +598,11 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
 			for (s = peer_name; s < ptr; s++)
 				*s = tolower(*s);
 
-		
 			/* We have to unlock the peer channel here to avoid a deadlock.
-			 * So, when we need it again, we have to lock the datastore and get
-			 * the pointer from there to see if the channel is still valid. */
+			 * So, when we need to dereference it again, we have to lock the 
+			 * datastore and get the pointer from there to see if the channel 
+			 * is still valid. */
 			ast_channel_unlock(peer);
-			peer = NULL;
 
 			if (!ast_test_flag(flags, OPTION_QUIET)) {
 				if (ast_fileexists(peer_name, NULL, NULL) != -1) {
@@ -620,7 +619,6 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
 					ast_say_digits(chan, atoi(ptr), "", chan->language);
 			}
 			
-			waitms = 5000;
 			res = channel_spy(chan, peer_chanspy_ds, &volfactor, fd, flags);
 			num_spyed_upon++;	
 
diff --git a/main/http.c b/main/http.c
index e335086bbd..2c7683e3bb 100644
--- a/main/http.c
+++ b/main/http.c
@@ -437,7 +437,7 @@ static void *ast_httpd_helper_thread(void *data)
 				
 				/* If we got a FireFox cookie string, the name's right  
 				    after "Cookie: "                                    */
-                                vname = cookie + 8;
+				vname = cookie + 8;
 				
 				/* If we got an IE cookie string, we need to skip to    
 				    past the version to get to the name                 */