diff options
| -rw-r--r-- | apps/app_chanspy.c | 8 | ||||
| -rw-r--r-- | main/http.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index bd66f7dc5..159fdb954 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 e335086bb..2c7683e3b 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 */ |