Skip to content

Commit 5150993

Browse files
committed
support for nginx 1.11.5-style cache-manager
1 parent c0bf381 commit 5150993

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

dash/ngx_rtmp_dash_module.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,14 +1413,22 @@ ngx_rtmp_dash_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
14131413
}
14141414

14151415

1416+
#if (nginx_version >= 1011005)
1417+
static ngx_msec_t
1418+
#else
14161419
static time_t
1420+
#endif
14171421
ngx_rtmp_dash_cleanup(void *data)
14181422
{
14191423
ngx_rtmp_dash_cleanup_t *cleanup = data;
14201424

14211425
ngx_rtmp_dash_cleanup_dir(&cleanup->path, cleanup->playlen);
14221426

1427+
#if (nginx_version >= 1011005)
1428+
return cleanup->playlen * 2;
1429+
#else
14231430
return cleanup->playlen / 500;
1431+
#endif
14241432
}
14251433

14261434

hls/ngx_rtmp_hls_module.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,14 +2210,22 @@ ngx_rtmp_hls_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
22102210
}
22112211

22122212

2213+
#if (nginx_version >= 1011005)
2214+
static ngx_msec_t
2215+
#else
22132216
static time_t
2217+
#endif
22142218
ngx_rtmp_hls_cleanup(void *data)
22152219
{
22162220
ngx_rtmp_hls_cleanup_t *cleanup = data;
22172221

22182222
ngx_rtmp_hls_cleanup_dir(&cleanup->path, cleanup->playlen);
22192223

2224+
#if (nginx_version >= 1011005)
2225+
return cleanup->playlen * 2;
2226+
#else
22202227
return cleanup->playlen / 500;
2228+
#endif
22212229
}
22222230

22232231

0 commit comments

Comments
 (0)