don't allow call waiting during the initial ringing (issue #5188)

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

CHANGES

@@ -11,6 +11,9 @@
        only, not requiring authentication on incoming invites, or both. Before,
        to not require authentication on incoming invites also required matching
        peers based on IP only.
+ -- chan_zap
+    -- Before, call waiting could occur during the initial ringing on the line.
+       This has now been fixed.
  -- app_disa
     -- We will now not set the accountcode if one is not supplied. 
  -- app_meetme

channels/chan_zap.c

@@ -6710,7 +6710,7 @@ static inline int available(struct zt_pvt *p, int channelmatch, int groupmatch,
 	}
 	
 	if ((p->owner->_state != AST_STATE_UP) &&
-		(p->owner->_state != AST_STATE_RINGING)) {
+		((p->owner->_state != AST_STATE_RINGING) || p->outgoing)) {
 		/* If the current call is not up, then don't allow the call */
 		return 0;
 	}