@@ -1191,7 +1191,7 @@ ngx_rtmp_live_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
1191
1191
ngx_uint_t peers ;
1192
1192
uint32_t delta ;
1193
1193
ngx_rtmp_live_chunk_stream_t * cs ;
1194
- ngx_http_request_t * http_request ;
1194
+ ngx_http_request_t * r ;
1195
1195
#ifdef NGX_DEBUG
1196
1196
u_char * msg_type ;
1197
1197
@@ -1265,25 +1265,26 @@ ngx_rtmp_live_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
1265
1265
ss = pctx -> session ;
1266
1266
handler = ngx_rtmp_live_proc_handlers [pctx -> protocol ];
1267
1267
if (pctx -> protocol == NGX_RTMP_PROTOCOL_HTTP ) {
1268
- http_request = ss -> data ;
1269
- if (http_request == NULL || (http_request -> connection && http_request -> connection -> destroyed )) {
1268
+ r = ss -> data ;
1269
+ if (r == NULL || (r -> connection && r -> connection -> destroyed )) {
1270
1270
continue ;
1271
1271
}
1272
- handler -> meta = handler -> append_message_pt (ss ,& ch ,NULL ,rpkt );
1272
+
1273
+ handler -> meta = handler -> append_message_pt (ss , & ch , NULL , rpkt );
1273
1274
if (handler -> meta == NULL ) {
1274
1275
continue ;
1275
1276
}
1276
- if (handler -> meta ) {
1277
- if (handler -> send_message_pt (ss ,handler -> meta ,0 ) != NGX_OK ) {
1278
- ++ pctx -> ndropped ;
1279
- cs -> dropped += delta ;
1280
- handler -> free_message_pt (ss , handler -> meta );
1281
- handler -> meta = NULL ;
1282
- continue ;
1283
- }
1277
+
1278
+ if (handler -> send_message_pt (ss , handler -> meta , 0 ) != NGX_OK ) {
1279
+ ++ pctx -> ndropped ;
1280
+ cs -> dropped += delta ;
1284
1281
handler -> free_message_pt (ss , handler -> meta );
1285
1282
handler -> meta = NULL ;
1283
+ continue ;
1286
1284
}
1285
+
1286
+ handler -> free_message_pt (ss , handler -> meta );
1287
+ handler -> meta = NULL ;
1287
1288
} else {
1288
1289
ngx_rtmp_prepare_message (s , & ch , NULL , rpkt );
1289
1290
if (ngx_rtmp_send_message (ss , rpkt , prio ) != NGX_OK ) {
0 commit comments