[fix] fix on_connect command bug.

Author: winshining

ngx_http_flv_live_module.c

@@ -915,12 +915,6 @@ ngx_http_flv_live_request(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 
     ngx_http_request_t          *r;
     ngx_http_flv_live_ctx_t     *ctx;
-    ngx_rtmp_notify_srv_conf_t  *nscf;
-
-    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
-    if (nscf && nscf->url[NGX_RTMP_NOTIFY_CONNECT]) {
-        s->wait_notify_connect = 1;
-    }
 
     r = s->data;
     ctx = ngx_http_get_module_ctx(r, ngx_http_flv_live_module);
@@ -1805,8 +1799,9 @@ ngx_int_t
 ngx_http_flv_live_connect_init(ngx_rtmp_session_t *s, ngx_str_t *app,
         ngx_str_t *stream)
 {
-    ngx_rtmp_connect_t     v;
-    ngx_http_request_t    *r;
+    ngx_rtmp_connect_t           v;
+    ngx_http_request_t          *r;
+    ngx_rtmp_notify_srv_conf_t  *nscf;
 
     r = s->data;
 
@@ -1838,6 +1833,11 @@ ngx_http_flv_live_connect_init(ngx_rtmp_session_t *s, ngx_str_t *app,
         return NGX_ERROR;
     }
 
+    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
+    if (nscf && nscf->url[NGX_RTMP_NOTIFY_CONNECT]) {
+        s->wait_notify_connect = 1;
+    }
+
     s->stream.len = stream->len;
     s->stream.data = ngx_pstrdup(s->connection->pool, stream);
 

ngx_rtmp_cmd_module.c

@@ -202,15 +202,15 @@ ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
         return NGX_ERROR;
     }
 
+    ngx_rtmp_cmd_fill_args(v.app, v.args);
+
     len = ngx_strlen(v.app);
     if (len > 10 && !ngx_memcmp(v.app + len - 10, "/_definst_", 10)) {
         v.app[len - 10] = 0;
     } else if (len && v.app[len - 1] == '/') {
         v.app[len - 1] = 0;
     }
 
-    ngx_rtmp_cmd_fill_args(v.app, v.args);
-
     ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
             "connect: app='%s' args='%s' flashver='%s' swf_url='%s' "
             "tc_url='%s' page_url='%s' acodecs=%uD vcodecs=%uD "