fix bug: http-flv http-ts hls2 crashed

Author: im-pingo

modules/nginx-rtmp-module/http/ngx_http_flv_live_module.c

@@ -131,7 +131,7 @@ ngx_http_flv_live_send_header(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    switch (hflcf->audio | (hflcf->video < 1)) {
+    switch (hflcf->audio | (hflcf->video << 1)) {
         case 1: // audio only
             b->start = b->pos = ngx_flv_live_audio_header;
             b->end = b->last = ngx_flv_live_audio_header +
@@ -528,6 +528,7 @@ ngx_http_flv_live_handler(ngx_http_request_t *r)
     ngx_rtmp_core_srv_conf_t           *cscf;
     ngx_rtmp_core_app_conf_t          **cacfp;
     ngx_http_cleanup_t                 *cln;
+    ngx_rtmp_core_main_conf_t          *cmcf;
 
     rc = ngx_http_discard_request_body(r);
 
@@ -612,6 +613,13 @@ ngx_http_flv_live_handler(ngx_http_request_t *r)
     s->stage = NGX_LIVE_PLAY;
     s->ptime = ngx_current_msec;
 
+    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
+    s->variables = ngx_pcalloc(s->pool, cmcf->variables.nelts
+            * sizeof(ngx_http_variable_value_t));
+    if (s->variables == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
     if (ngx_rtmp_play_filter(s, &v) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }

modules/nginx-rtmp-module/mpegts/ngx_hls_http_module.c

@@ -611,6 +611,7 @@ ngx_hls_http_create_session(ngx_http_request_t *r)
     ngx_uint_t                  n;
     ngx_rtmp_core_srv_conf_t   *cscf;
     ngx_rtmp_core_app_conf_t  **cacfp;
+    ngx_rtmp_core_main_conf_t  *cmcf;
 
     hlcf = ngx_http_get_module_loc_conf(r, ngx_hls_http_module);
 
@@ -678,6 +679,13 @@ ngx_hls_http_create_session(ngx_http_request_t *r)
     s->ptime = ngx_current_msec;
 //    s->connection = r->connection;
 
+    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
+    s->variables = ngx_pcalloc(s->pool, cmcf->variables.nelts
+            * sizeof(ngx_http_variable_value_t));
+    if (s->variables == NULL) {
+        return NULL;
+    }
+
     if (ngx_rtmp_play_filter(s, &v) != NGX_OK) {
         return NULL;
     }

modules/nginx-rtmp-module/mpegts/ngx_mpegts_http_module.c

@@ -433,6 +433,7 @@ ngx_mpegts_http_handler(ngx_http_request_t *r)
     ngx_rtmp_core_srv_conf_t     *cscf;
     ngx_rtmp_core_app_conf_t    **cacfp;
     ngx_http_cleanup_t           *cln;
+    ngx_rtmp_core_main_conf_t    *cmcf;
 
     ctx = ngx_pcalloc(r->pool, sizeof(ngx_mpegts_http_ctx_t));
     if (ctx == NULL) {
@@ -512,6 +513,13 @@ ngx_mpegts_http_handler(ngx_http_request_t *r)
     s->stage = NGX_LIVE_PLAY;
     s->ptime = ngx_current_msec;
 
+    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
+    s->variables = ngx_pcalloc(s->pool, cmcf->variables.nelts
+            * sizeof(ngx_http_variable_value_t));
+    if (s->variables == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
     if (ngx_rtmp_play_filter(s, &v) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }

release.sh

@@ -178,6 +178,7 @@ then
         apt-get install -y libpcre3 libpcre3-dev
         apt-get install -y zlib1g-dev
         apt-get install -y openssl
+        apt-get install -y libssl-dev
 
     elif [ "$CMD" == "brew" ]
     then