Skip to content

Commit f3401d4

Browse files
committed
[fix] fix a compatibility bug.
1 parent 00a8548 commit f3401d4

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

ngx_http_flv_live_module.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ extern ngx_module_t ngx_http_headers_filter_module;
7878

7979
static u_char ngx_http_server_string[] = "Server: nginx" CRLF;
8080
static u_char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF;
81+
#if (nginx_version >= 1011010)
8182
static u_char ngx_http_server_build_string[] = "Server: " NGINX_VER_BUILD CRLF;
82-
83+
#endif
8384

8485
static ngx_str_t ngx_http_status_lines[] = {
8586

@@ -650,6 +651,7 @@ ngx_http_flv_live_header_filter(ngx_rtmp_session_t *s)
650651
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
651652

652653
if (r->headers_out.server == NULL) {
654+
#if (nginx_version >= 1011010)
653655
if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
654656
len += sizeof(ngx_http_server_full_string) - 1;
655657

@@ -659,6 +661,10 @@ ngx_http_flv_live_header_filter(ngx_rtmp_session_t *s)
659661
} else {
660662
len += sizeof(ngx_http_server_string) - 1;
661663
}
664+
#else
665+
len += clcf->server_tokens ? sizeof(ngx_http_server_full_string) - 1 :
666+
sizeof(ngx_http_server_string) - 1;
667+
#endif
662668
}
663669

664670
if (r->headers_out.date == NULL) {
@@ -752,6 +758,7 @@ ngx_http_flv_live_header_filter(ngx_rtmp_session_t *s)
752758
*b->last++ = CR; *b->last++ = LF;
753759

754760
if (r->headers_out.server == NULL) {
761+
#if (nginx_version >= 1011010)
755762
if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
756763
p = ngx_http_server_full_string;
757764
len = sizeof(ngx_http_server_full_string) - 1;
@@ -761,6 +768,13 @@ ngx_http_flv_live_header_filter(ngx_rtmp_session_t *s)
761768
len = sizeof(ngx_http_server_build_string) - 1;
762769

763770
} else {
771+
#else
772+
if (clcf->server_tokens) {
773+
p = (u_char *) ngx_http_server_full_string;
774+
len = sizeof(ngx_http_server_full_string) - 1;
775+
776+
} else {
777+
#endif
764778
p = ngx_http_server_string;
765779
len = sizeof(ngx_http_server_string) - 1;
766780
}

0 commit comments

Comments
 (0)