Do not omit the first header of a UserEvent AMI action from the corresponding emitted...

ASTERISK-24124 #close
Reported by Matt Jordan

AFS-131 #close
Reported by Matt Jordan

Patches:
	userevent.patch uploaded by Matt Jordan (License #6283)

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

diff --git a/main/manager.c b/main/manager.c
index 47a909b..0a10d8c 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -5303,8 +5303,9 @@ static int action_userevent(struct mansession *s, const struct message *m)
 
        ast_str_reset(body);
 
 
        ast_str_reset(body);
 

-       for (x = 1; x < m->hdrcount; x++) {
-               if (strncasecmp("UserEvent:", m->headers[x], strlen("UserEvent:"))) {
+       for (x = 0; x < m->hdrcount; x++) {
+               if (strncasecmp("UserEvent:", m->headers[x], strlen("UserEvent:")) &&
+                               strncasecmp("Action:", m->headers[x], strlen("Action:"))) {

                        ast_str_append(&body, 0, "%s\r\n", m->headers[x]);
                }
        }
                        ast_str_append(&body, 0, "%s\r\n", m->headers[x]);
                }
        }