Changes - j0ke.net Open Build Service

@@ -1,75 +0,0 @@ -------------------------------------------------------------------- -Wed Aug 14 12:08:47 UTC 2019 - Local OBS User <cs@linux-administrator.com> - -- security update 1.16.1 - -------------------------------------------------------------------- -Tue Mar 12 06:58:53 UTC 2019 - Local OBS User <cs@linux-administrator.com> - -- update to nginx 1.14.2 -- update openssl to 1.1.1b - -------------------------------------------------------------------- -Tue Jun 5 13:27:07 UTC 2018 - cs@linux-administrator.com - -- update to nginx 1.14.0 - -------------------------------------------------------------------- -Tue Jun 5 13:00:11 UTC 2018 - cs@linux-administrator.com - -- update to nginx 1.13.12 -- update openssl to 1.1.0h - -------------------------------------------------------------------- -Mon Mar 5 06:35:03 UTC 2018 - cs@linux-administrator.com - -- downgrade to 1.13.8 because of startup segfault - -------------------------------------------------------------------- -Wed Feb 28 06:49:49 UTC 2018 - cs@linux-administrator.com - -- update to nginx 1.13.9 - -------------------------------------------------------------------- -Wed Jan 17 08:34:43 UTC 2018 - cs@linux-administrator.com - -- update to nginx 1.13.8 - -------------------------------------------------------------------- -Tue Dec 12 11:37:50 UTC 2017 - cs@linux-administrator.com - -- update to nginx 1.13.7 - -------------------------------------------------------------------- -Wed Apr 5 10:58:26 UTC 2017 - cs@linux-administrator.com - -- update to nginx 1.11.13 - -------------------------------------------------------------------- -Wed Dec 28 20:00:08 UTC 2016 - cs@linux-administrator.com - -- update to nginx 1.11.8 - -------------------------------------------------------------------- -Wed Dec 14 11:07:19 UTC 2016 - cs@linux-administrator.com - -- update to nginx 1.11.7 - -------------------------------------------------------------------- -Mon Nov 28 07:21:41 UTC 2016 - cs@linux-administrator.com - -- update to nginx 1.11.6 -- update nginx rtmp module to 1.1.10 - -------------------------------------------------------------------- -Wed Oct 12 21:29:31 UTC 2016 - cs@linux-administrator.com - -- update to nginx 1.11.5 - -------------------------------------------------------------------- -Wed Sep 28 18:04:31 UTC 2016 - cs@linux-administrator.com - -- update to nginx 1.11.4 -- update openssl to 1.0.2j -- update nginx rtmp module to 1.1.9 -

@@ -1,38 +0,0 @@ -From 2bc1dac6fb3ed263529decb211ec784824132bf4 Mon Sep 17 00:00:00 2001 -From: Chris Lea <chris.lea@gmail.com> -Date: Tue, 15 Nov 2016 22:26:35 -0800 -Subject: [PATCH] default_port was removed in 1.11.6. - ---- - ngx_http_upstream_fair_module.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c -index a4419ca..66144e9 100644 ---- a/ngx_http_upstream_fair_module.c -+++ b/ngx_http_upstream_fair_module.c -@@ -540,7 +540,11 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) - - /* an upstream implicitly defined by proxy_pass, etc. */ - -+#if nginx_version < 1011006 - if (us->port == 0 && us->default_port == 0) { -+#else -+ if (us->port == 0) { -+#endif - ngx_log_error(NGX_LOG_EMERG, cf->log, 0, - "no port in upstream \"%V\" in %s:%ui", - &us->host, us->file_name, us->line); -@@ -550,8 +554,11 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) - ngx_memzero(&u, sizeof(ngx_url_t)); - - u.host = us->host; -+#if nginx_version < 1011006 - u.port = (in_port_t) (us->port ? us->port : us->default_port); -- -+#else -+ u.port = (in_port_t) us->port; -+#endif - if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { - if (u.err) { - ngx_log_error(NGX_LOG_EMERG, cf->log, 0,

@@ -0,0 +1,209 @@ +diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c +index 89ccc2b..a552044 100644 +--- a/src/http/modules/ngx_http_upstream_ip_hash_module.c ++++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c +@@ -9,6 +9,10 @@ + #include <ngx_core.h> + #include <ngx_http.h> + ++#if (NGX_UPSTREAM_CHECK_MODULE) ++#include "ngx_http_upstream_check_handler.h" ++#endif ++ + + typedef struct { + /* the round robin data must be first */ +@@ -208,6 +212,12 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data) + + if (!peer->down) { + ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ++ "get ip_hash peer, check_index: %ui", ++ peer->check_index); ++ if (!ngx_http_check_peer_down(peer->check_index)) { ++#endif + if (peer->max_fails == 0 || peer->fails < peer->max_fails) { + break; + } +@@ -216,6 +226,9 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data) + peer->checked = now; + break; + } ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ } ++#endif + } + + iphp->rrp.tried[n] |= m; +diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c +index 21156ae..c57393d 100644 +--- a/src/http/modules/ngx_http_upstream_least_conn_module.c ++++ b/src/http/modules/ngx_http_upstream_least_conn_module.c +@@ -9,6 +9,10 @@ + #include <ngx_core.h> + #include <ngx_http.h> + ++#if (NGX_UPSTREAM_CHECK_MODULE) ++#include "ngx_http_upstream_check_handler.h" ++#endif ++ + + typedef struct { + ngx_uint_t *conns; +@@ -203,6 +207,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data) + continue; + } + ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ++ "get least_conn peer, check_index: %ui", ++ peer->check_index); ++ ++ if (ngx_http_check_peer_down(peer->check_index)) { ++ continue; ++ } ++#endif ++ + if (peer->max_fails + && peer->fails >= peer->max_fails + && now - peer->checked <= peer->fail_timeout) +@@ -256,6 +270,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data) + continue; + } + ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ++ "get least_conn peer, check_index: %ui", ++ peer->check_index); ++ ++ if (ngx_http_check_peer_down(peer->check_index)) { ++ continue; ++ } ++#endif ++ + if (lcp->conns[i] * best->weight != lcp->conns[p] * peer->weight) { + continue; + } +diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c +index 4b78cff..f077b46 100644 +--- a/src/http/ngx_http_upstream_round_robin.c ++++ b/src/http/ngx_http_upstream_round_robin.c +@@ -9,6 +9,9 @@ + #include <ngx_core.h> + #include <ngx_http.h> + ++#if (NGX_UPSTREAM_CHECK_MODULE) ++#include "ngx_http_upstream_check_handler.h" ++#endif + + static ngx_int_t ngx_http_upstream_cmp_servers(const void *one, + const void *two); +@@ -87,7 +90,17 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, + peers->peer[n].weight = server[i].weight; + peers->peer[n].effective_weight = server[i].weight; + peers->peer[n].current_weight = 0; +- n++; ++ ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ if (!server[i].down) { ++ peers->peer[n].check_index = ++ ngx_http_check_add_peer(cf, us, &server[i].addrs[j]); ++ } ++ else { ++ peers->peer[n].check_index = (ngx_uint_t) NGX_ERROR; ++ } ++#endif ++ n++; + } + } + +@@ -145,6 +158,17 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, + backup->peer[n].max_fails = server[i].max_fails; + backup->peer[n].fail_timeout = server[i].fail_timeout; + backup->peer[n].down = server[i].down; ++ ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ if (!server[i].down) { ++ backup->peer[n].check_index = ++ ngx_http_check_add_peer(cf, us, &server[i].addrs[j]); ++ } ++ else { ++ backup->peer[n].check_index = (ngx_uint_t) NGX_ERROR; ++ } ++#endif ++ + n++; + } + } +@@ -206,6 +230,9 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, + peers->peer[i].current_weight = 0; + peers->peer[i].max_fails = 1; + peers->peer[i].fail_timeout = 10; ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR; ++#endif + } + + us->peer.data = peers; +@@ -323,6 +350,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, + peers->peer[0].current_weight = 0; + peers->peer[0].max_fails = 1; + peers->peer[0].fail_timeout = 10; ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ peers->peer[0].check_index = (ngx_uint_t) NGX_ERROR; ++#endif + + } else { + +@@ -356,6 +386,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, + peers->peer[i].current_weight = 0; + peers->peer[i].max_fails = 1; + peers->peer[i].fail_timeout = 10; ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR; ++#endif + } + } + +@@ -434,6 +467,12 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data) + goto failed; + } + ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ if (ngx_http_check_peer_down(peer->check_index)) { ++ goto failed; ++ } ++#endif ++ + } else { + + /* there are several peers */ +@@ -531,6 +570,12 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp) + continue; + } + ++#if (NGX_UPSTREAM_CHECK_MODULE) ++ if (ngx_http_check_peer_down(peer->check_index)) { ++ continue; ++ } ++#endif ++ + if (peer->max_fails + && peer->fails >= peer->max_fails + && now - peer->checked <= peer->fail_timeout) +diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h +index 3f8cbf8..1613168 100644 +--- a/src/http/ngx_http_upstream_round_robin.h ++++ b/src/http/ngx_http_upstream_round_robin.h +@@ -30,6 +30,10 @@ typedef struct {

@@ -1,195 +0,0 @@ -diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c -index 148d73a..913e395 100644 ---- a/src/http/modules/ngx_http_upstream_ip_hash_module.c -+++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c -@@ -9,6 +9,9 @@ - #include <ngx_core.h> - #include <ngx_http.h> - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+#include "ngx_http_upstream_check_module.h" -+#endif - - typedef struct { - /* the round robin data must be first */ -@@ -212,6 +215,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data) - goto next_try; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, -+ "get ip_hash peer, check_index: %ui", -+ peer->check_index); -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ goto next_try; -+ } -+#endif -+ - if (peer->max_fails - && peer->fails >= peer->max_fails - && now - peer->checked <= peer->fail_timeout) -diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c -index 623bc9b..a223839 100644 ---- a/src/http/modules/ngx_http_upstream_least_conn_module.c -+++ b/src/http/modules/ngx_http_upstream_least_conn_module.c -@@ -9,6 +9,9 @@ - #include <ngx_core.h> - #include <ngx_http.h> - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+#include "ngx_http_upstream_check_module.h" -+#endif - - typedef struct { - ngx_uint_t *conns; -@@ -203,6 +206,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data) - continue; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, -+ "get least_conn peer, check_index: %ui", -+ peer->check_index); -+ -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ continue; -+ } -+#endif -+ - if (peer->max_fails - && peer->fails >= peer->max_fails - && now - peer->checked <= peer->fail_timeout) -@@ -256,6 +269,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data) - continue; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, -+ "get least_conn peer, check_index: %ui", -+ peer->check_index); -+ -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ continue; -+ } -+#endif -+ - if (lcp->conns[i] * best->weight != lcp->conns[p] * peer->weight) { - continue; - } -diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c -index 2d0649b..b9789eb 100644 ---- a/src/http/ngx_http_upstream_round_robin.c -+++ b/src/http/ngx_http_upstream_round_robin.c -@@ -9,6 +9,9 @@ - #include <ngx_core.h> - #include <ngx_http.h> - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+#include "ngx_http_upstream_check_module.h" -+#endif - - #define ngx_http_upstream_tries(p) ((p)->number \ - + ((p)->next ? (p)->next->number : 0)) -@@ -92,6 +95,14 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, - peer[n].fail_timeout = server[i].fail_timeout; - peer[n].down = server[i].down; - peer[n].server = server[i].name; -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (!server[i].down) { -+ peers->peer[n].check_index = -+ ngx_http_upstream_check_add_peer(cf, us, &server[i].addrs[j]); -+ } else { -+ peers->peer[n].check_index = (ngx_uint_t) NGX_ERROR; -+ } -+#endif - n++; - } - } -@@ -148,6 +159,15 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, - peer[n].fail_timeout = server[i].fail_timeout; - peer[n].down = server[i].down; - peer[n].server = server[i].name; -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (!server[i].down) { -+ backup->peer[n].check_index = -+ ngx_http_upstream_check_add_peer(cf, us, &server[i].addrs[j]); -+ } -+ else { -+ backup->peer[n].check_index = (ngx_uint_t) NGX_ERROR; -+ } -+#endif - n++; - } - } -@@ -207,6 +227,9 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, - peer[i].current_weight = 0; - peer[i].max_fails = 1; - peer[i].fail_timeout = 10; -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR; -+#endif - } - - us->peer.data = peers; -@@ -316,7 +339,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, - peer[0].current_weight = 0; - peer[0].max_fails = 1; - peer[0].fail_timeout = 10; -- -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ peers->peer[0].check_index = (ngx_uint_t) NGX_ERROR; -+#endif - } else { - - for (i = 0; i < ur->naddrs; i++) { -@@ -356,6 +381,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, - peer[i].current_weight = 0; - peer[i].max_fails = 1; - peer[i].fail_timeout = 10; -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR; -+#endif - } - } - -@@ -415,6 +443,12 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data) - goto failed; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ goto failed; -+ } -+#endif -+ - } else { - - /* there are several peers */ -@@ -507,6 +541,12 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp) - continue; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ continue; -+ } -+#endif -+ - if (peer->max_fails - && peer->fails >= peer->max_fails - && now - peer->checked <= peer->fail_timeout) -diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h -index 9db82a6..6e19a65 100644 ---- a/src/http/ngx_http_upstream_round_robin.h -+++ b/src/http/ngx_http_upstream_round_robin.h -@@ -31,6 +31,10 @@ typedef struct { - ngx_uint_t max_fails; - time_t fail_timeout; - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_uint_t check_index; -+#endif -+ - ngx_uint_t down; /* unsigned down:1; */ - - #if (NGX_HTTP_SSL)

@@ -0,0 +1,13 @@ +--- nginx-1.2.0/src/core/nginx.h 2012-04-23 14:54:14.000000000 +0200 ++++ nginx-1.2.0/src/core/nginx.h~ 2012-04-25 16:20:55.000000000 +0200 +@@ -10,8 +10,8 @@ + + + #define nginx_version 1002000 +-#define NGINX_VERSION "1.2.0" +-#define NGINX_VER "nginx/" NGINX_VERSION ++#define NGINX_VERSION "" ++#define NGINX_VER "" NGINX_VERSION + + #define NGINX_VAR "NGINX" + #define NGX_OLDPID_EXT ".oldbin"

@@ -0,0 +1,12 @@ +diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h +index f234840..b7665e9 100644 +--- a/src/http/ngx_http_request.h ++++ b/src/http/ngx_http_request.h +@@ -489,6 +489,7 @@ struct ngx_http_request_s { + */ + unsigned limit_conn_set:1; + unsigned limit_req_set:1; ++ unsigned sysguard_set:1; + + #if 0 + unsigned cacheable:1;

@@ -0,0 +1,44 @@ +--- src/event/ngx_event_openssl.c ++++ src/event/ngx_event_openssl.c +@@ -18,6 +18,9 @@ typedef struct { + static int ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store); + static void ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, + int ret); ++static void ngx_ssl_msg_callback( ++ int write_p, int version, int content_type, ++ const void *buf, size_t len, SSL *ssl, void *log); + static void ngx_ssl_handshake_handler(ngx_event_t *ev); + static ngx_int_t ngx_ssl_handle_recv(ngx_connection_t *c, int n); + static void ngx_ssl_write_handler(ngx_event_t *wev); +@@ -244,6 +247,8 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data) + SSL_CTX_set_read_ahead(ssl->ctx, 1); + + SSL_CTX_set_info_callback(ssl->ctx, ngx_ssl_info_callback); ++ SSL_CTX_set_msg_callback(ssl->ctx, ngx_ssl_msg_callback); ++ SSL_CTX_set_msg_callback_arg(ssl->ctx, ssl->log); + + return NGX_OK; + } +@@ -532,6 +537,22 @@ ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store) + return 1; + } + ++static void ngx_ssl_msg_callback( ++ int write_p, int version, int content_type, ++ const void *buf, size_t len, ngx_ssl_conn_t *ssl, void *log) ++{ ++ if (write_p == 0 && content_type == TLS1_RT_HEARTBEAT) { ++ unsigned char *p = buf; ++ unsigned int payload; ++ ++ payload = (((unsigned int)(p[1])) << 8) | ((unsigned int)(p[2])); ++ if (1 + 2 + payload + 16 > len) { ++ ngx_log_error(NGX_LOG_ALERT, ((ngx_log_t*)log), 0, "Heartbleed attack detected"); ++ } ++ } ++ ++} ++ + + static void + ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret) \ No newline at end of file

@@ -1,5227 +0,0 @@ -From d21c75c622eb13a80080ed15fa30474f806a0a0f Mon Sep 17 00:00:00 2001 -From: Vlad Krasnov <vlad@cloudflare.com> -Date: Fri, 12 Feb 2016 18:25:11 -0800 -Subject: [PATCH] Implementation of draft and RFC versions of CHACHA20-POLY1305 - ciphers - ---- - Configure | 48 +- - Makefile.org | 4 +- - apps/speed.c | 30 +- - crypto/chacha20poly1305/Makefile | 97 +++ - crypto/chacha20poly1305/asm/chacha20_avx.pl | 408 +++++++++++ - crypto/chacha20poly1305/asm/chacha20_avx2.pl | 443 ++++++++++++ - crypto/chacha20poly1305/asm/poly1305_avx.pl | 732 ++++++++++++++++++++ - crypto/chacha20poly1305/asm/poly1305_avx2.pl | 984 +++++++++++++++++++++++++++ - crypto/chacha20poly1305/asm/poly1305_x64.pl | 281 ++++++++ - crypto/chacha20poly1305/chacha20.c | 162 +++++ - crypto/chacha20poly1305/chacha20poly1305.h | 79 +++ - crypto/chacha20poly1305/chapolytest.c | 470 +++++++++++++ - crypto/chacha20poly1305/poly1305.c | 287 ++++++++ - crypto/cryptlib.c | 10 - - crypto/evp/Makefile | 7 +- - crypto/evp/e_chacha20poly1305.c | 435 ++++++++++++ - crypto/evp/evp.h | 4 + - ssl/s3_lib.c | 119 ++++ - ssl/ssl.h | 2 + - ssl/ssl_ciph.c | 60 +- - ssl/ssl_locl.h | 2 + - ssl/tls1.h | 28 + - test/Makefile | 17 +- - 23 files changed, 4655 insertions(+), 54 deletions(-) - create mode 100644 crypto/chacha20poly1305/Makefile - create mode 100644 crypto/chacha20poly1305/asm/chacha20_avx.pl - create mode 100644 crypto/chacha20poly1305/asm/chacha20_avx2.pl - create mode 100644 crypto/chacha20poly1305/asm/poly1305_avx.pl - create mode 100644 crypto/chacha20poly1305/asm/poly1305_avx2.pl - create mode 100644 crypto/chacha20poly1305/asm/poly1305_x64.pl - create mode 100644 crypto/chacha20poly1305/chacha20.c - create mode 100644 crypto/chacha20poly1305/chacha20poly1305.h - create mode 100644 crypto/chacha20poly1305/chapolytest.c - create mode 100644 crypto/chacha20poly1305/poly1305.c - create mode 100644 crypto/evp/e_chacha20poly1305.c - -diff --git a/Configure b/Configure -index 4a715dc..f3ab6cd 100755 ---- a/Configure -+++ b/Configure -@@ -146,25 +146,25 @@ my $tlib="-lnsl -lsocket"; - my $bits1="THIRTY_TWO_BIT "; - my $bits2="SIXTY_FOUR_BIT "; - --my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o::des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:"; -+my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o::des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o::"; - - my $x86_elf_asm="$x86_asm:elf"; - --my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o:ecp_nistz256.o ecp_nistz256-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o aesni-gcm-x86_64.o:"; --my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void"; --my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o::des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o::::::camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o:ghash-sparcv9.o::void"; --my $sparcv8_asm=":sparcv8.o::des_enc-sparc.o fcrypt_b.o:::::::::::::void"; --my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::sha1-alpha.o:::::::ghash-alpha.o::void"; --my $mips64_asm=":bn-mips.o mips-mont.o:::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::"; -+my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o:ecp_nistz256.o ecp_nistz256-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o aesni-gcm-x86_64.o::chacha20_avx.o chacha20_avx2.o poly1305_x64.o poly1305_avx2.o"; -+my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o:::void"; -+my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o::des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o::::::camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o:ghash-sparcv9.o:::void"; -+my $sparcv8_asm=":sparcv8.o::des_enc-sparc.o fcrypt_b.o::::::::::::::void"; -+my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::sha1-alpha.o:::::::ghash-alpha.o:::void"; -+my $mips64_asm=":bn-mips.o mips-mont.o:::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o:::::::::"; - my $mips32_asm=$mips64_asm; $mips32_asm =~ s/\s*sha512\-mips\.o//; --my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o:::aes-s390x.o aes-ctr.o aes-xts.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o:"; --my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o:::aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o ghashv8-armx.o::void"; --my $aarch64_asm="armcap.o arm64cpuid.o mem_clr.o::::aes_core.o aes_cbc.o aesv8-armx.o:::sha1-armv8.o sha256-armv8.o sha512-armv8.o:::::::ghashv8-armx.o:"; --my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::32"; --my $parisc20_asm="pariscid.o:pa-risc2W.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::64"; --my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o:::aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o:::::::ghashp8-ppc.o:"; -+my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o:::aes-s390x.o aes-ctr.o aes-xts.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o::"; -+my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o:::aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o ghashv8-armx.o:::void"; -+my $aarch64_asm="armcap.o arm64cpuid.o mem_clr.o::::aes_core.o aes_cbc.o aesv8-armx.o:::sha1-armv8.o sha256-armv8.o sha512-armv8.o:::::::ghashv8-armx.o::"; -+my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o:::32"; -+my $parisc20_asm="pariscid.o:pa-risc2W.o parisc-mont.o:::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o:::64"; -+my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o:::aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o:::::::ghashp8-ppc.o::"; - my $ppc32_asm=$ppc64_asm; --my $no_asm="::::::::::::::::void"; -+my $no_asm=":::::::::::::::::void"; - - # As for $BSDthreads. Idea is to maintain "collective" set of flags, - # which would cover all BSD flavors. -pthread applies to them all, -@@ -710,6 +710,7 @@ my $idx_wp_obj = $idx++; - my $idx_cmll_obj = $idx++; - my $idx_modes_obj = $idx++; - my $idx_engines_obj = $idx++; -+my $idx_chapoly_obj = $idx++; - my $idx_perlasm_scheme = $idx++; - my $idx_dso_scheme = $idx++; - my $idx_shared_target = $idx++; -@@ -752,6 +753,7 @@ my $bf ="crypto/bf/bf_locl.h"; - my $bn_asm ="bn_asm.o"; - my $des_enc="des_enc.o fcrypt_b.o"; - my $aes_enc="aes_core.o aes_cbc.o"; -+my $chapoly_enc=""; - my $bf_enc ="bf_enc.o"; - my $cast_enc="c_enc.o"; - my $rc4_enc="rc4_enc.o rc4_skey.o"; -@@ -1210,7 +1212,7 @@ $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/] - - print "IsMK1MF=$IsMK1MF\n"; - --my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); -+my @fields = split(/\s*:\s*/,$table{$target} . ":" x 31 , -1); - my $cc = $fields[$idx_cc]; - # Allow environment CC to override compiler... - if($ENV{CC}) { -@@ -1239,6 +1241,7 @@ my $wp_obj = $fields[$idx_wp_obj]; - my $cmll_obj = $fields[$idx_cmll_obj]; - my $modes_obj = $fields[$idx_modes_obj]; - my $engines_obj = $fields[$idx_engines_obj]; -+my $chapoly_obj = $fields[$idx_chapoly_obj]; - my $perlasm_scheme = $fields[$idx_perlasm_scheme]; - my $dso_scheme = $fields[$idx_dso_scheme]; - my $shared_target = $fields[$idx_shared_target]; -@@ -1405,7 +1408,7 @@ if ($no_asm) - { - $cpuid_obj=$bn_obj=$ec_obj= - $des_obj=$aes_obj=$bf_obj=$cast_obj=$rc4_obj=$rc5_obj=$cmll_obj= -- $modes_obj=$sha1_obj=$md5_obj=$rmd160_obj=$wp_obj=$engines_obj=""; -+ $modes_obj=$sha1_obj=$md5_obj=$rmd160_obj=$wp_obj=$engines_obj=$chapoly_obj=""; - } - - if (!$no_shared) -@@ -1558,6 +1561,14 @@ $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/); - $cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/); - $rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/); - $rc5_obj=$rc5_enc unless ($rc5_obj =~ /\.o$/); -+if ($chapoly_obj =~ /\.o$/) -+ { -+ $cflags.=" -DCHAPOLY_x86_64_ASM"; -+ } -+else -+ { -+ $chapoly_obj=$chapoly_enc; -+ } - if ($sha1_obj =~ /\.o$/) - { - # $sha1_obj=$sha1_enc; -@@ -1740,6 +1751,7 @@ while (<IN>) - s/^WP_ASM_OBJ=.*$/WP_ASM_OBJ= $wp_obj/; - s/^CMLL_ENC=.*$/CMLL_ENC= $cmll_obj/; - s/^MODES_ASM_OBJ.=*$/MODES_ASM_OBJ= $modes_obj/; -+ s/^CHAPOLY_ENC=.*$/CHAPOLY_ENC= $chapoly_obj/; - s/^ENGINES_ASM_OBJ.=*$/ENGINES_ASM_OBJ= $engines_obj/; - s/^PERLASM_SCHEME=.*$/PERLASM_SCHEME= $perlasm_scheme/; - s/^PROCESSOR=.*/PROCESSOR= $processor/; -@@ -1802,6 +1814,7 @@ print "RMD160_OBJ_ASM=$rmd160_obj\n"; - print "CMLL_ENC =$cmll_obj\n"; - print "MODES_OBJ =$modes_obj\n"; - print "ENGINES_OBJ =$engines_obj\n"; -+print "CHAPOLY_ENC =$chapoly_obj\n"; - print "PROCESSOR =$processor\n"; - print "RANLIB =$ranlib\n"; - print "ARFLAGS =$arflags\n"; -@@ -2200,7 +2213,7 @@ sub print_table_entry - my ($cc, $cflags, $unistd, $thread_cflag, $sys_id, $lflags, - $bn_ops, $cpuid_obj, $bn_obj, $ec_obj, $des_obj, $aes_obj, $bf_obj, - $md5_obj, $sha1_obj, $cast_obj, $rc4_obj, $rmd160_obj, -- $rc5_obj, $wp_obj, $cmll_obj, $modes_obj, $engines_obj, -+ $rc5_obj, $wp_obj, $cmll_obj, $modes_obj, $engines_obj, $chapoly_obj, - $perlasm_scheme, $dso_scheme, $shared_target, $shared_cflag, - $shared_ldflag, $shared_extension, $ranlib, $arflags, $multilib)= - split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); -@@ -2231,6 +2244,7 @@ sub print_table_entry - \$cmll_obj = $cmll_obj - \$modes_obj = $modes_obj - \$engines_obj = $engines_obj -+\$chapoly_obj = $chapoly_obj - \$perlasm_scheme = $perlasm_scheme - \$dso_scheme = $dso_scheme - \$shared_target= $shared_target -diff --git a/Makefile.org b/Makefile.org -index 76fdbdf..6556ef6 100644 ---- a/Makefile.org -+++ b/Makefile.org -@@ -91,6 +91,7 @@ BN_ASM= bn_asm.o - EC_ASM= - DES_ENC= des_enc.o fcrypt_b.o - AES_ENC= aes_core.o aes_cbc.o -+CHAPOLY_ENC= - BF_ENC= bf_enc.o - CAST_ENC= c_enc.o - RC4_ENC= rc4_enc.o -@@ -148,7 +149,7 @@ SDIRS= \ - bn ec rsa dsa ecdsa dh ecdh dso engine \ - buffer bio stack lhash rand err \ - evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ -- cms pqueue ts jpake srp store cmac -+ cms pqueue ts jpake srp store cmac chacha20poly1305 - # keep in mind that the above list is adjusted by ./Configure - # according to no-xxx arguments... - -@@ -234,6 +235,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\

@@ -1,7 +0,0 @@ -<services> - <service name="download_url"> - <param name="host">nginx.org</param> - <param name="protocol">http</param> - <param name="path">/download/nginx-1.16.1.tar.gz</param> - </service> -<service name="download_url"><param name="host">www.openssl.org</param><param name="protocol">https</param><param name="path">/source/openssl-1.1.1b.tar.gz</param></service></services>

@@ -1,718 +0,0 @@ -### updates are avail. at raw.githubusercontent.com/mariusv/nginx-badbot-blocker/master/blockips.conf - - -deny 178.238.234.1; -deny 76.90.254.19; -deny 85.17.26.68; # spammy comments - Leaseweb -deny 85.17.230.23; # spammy comments - Leaseweb -deny 173.234.11.105; # junk referrers -deny 173.234.31.9; # junk referrers - Ubiquityservers -deny 173.234.38.25; # spammy comments -deny 173.234.153.30; # junk referrers -deny 173.234.153.106; # spammy comments - Ubiquityservers -deny 173.234.175.68; # spammy comments -deny 190.152.223.27; # junk referrers -deny 195.191.54.90; # odd behaviour, Mozilla, doesnt fetch js/css. Ended up doing a POST, prob a spambot -deny 195.229.241.174; # spammy comments - United Arab Emirates -deny 210.212.194.60; # junk referrers + spammy comments -deny 76.91.248.49; # bad bot -deny 1.4.0.0/17; -deny 1.10.16.0/20; -deny 1.116.0.0/14; -deny 5.34.242.0/23; -deny 5.72.0.0/14; -deny 5.134.128.0/19; -deny 14.4.0.0/14; -deny 14.245.0.0/16; -deny 23.235.48.0/20; -deny 27.111.48.0/20; -deny 27.122.32.0/20; -deny 27.126.160.0/20; -deny 31.11.43.0/24; -deny 31.222.200.0/21; -deny 36.0.8.0/21; -deny 36.37.48.0/20; -deny 37.139.49.0/24; -deny 37.148.216.0/21; -deny 37.246.0.0/16; -deny 41.72.64.0/19; -deny 42.0.32.0/19; -deny 42.1.56.0/22; -deny 42.1.128.0/17; -deny 42.52.0.0/14; -deny 42.83.80.0/22; -deny 42.96.0.0/18; -deny 42.123.36.0/22; -deny 42.128.0.0/12; -deny 42.160.0.0/12; -deny 42.194.8.0/22; -deny 42.194.12.0/22; -deny 42.194.128.0/17; -deny 43.229.52.0/22; -deny 43.236.0.0/16; -deny 43.250.64.0/22; -deny 43.250.116.0/22; -deny 43.252.80.0/22; -deny 43.252.152.0/22; -deny 43.252.180.0/22; -deny 43.255.188.0/22; -deny 45.64.88.0/22; -deny 45.117.208.0/22; -deny 45.121.144.0/22; -deny 46.29.248.0/22; -deny 46.29.248.0/21; -deny 46.148.112.0/20; -deny 46.151.48.0/21; -deny 46.232.192.0/21; -deny 46.243.140.0/24; -deny 46.243.142.0/24; -deny 49.8.0.0/14; -deny 49.128.104.0/22; -deny 58.87.64.0/18; -deny 59.254.0.0/15; -deny 60.233.0.0/16; -deny 61.11.224.0/19; -deny 61.13.128.0/17; -deny 61.45.251.0/24; -deny 62.182.152.0/21; -deny 64.234.224.0/20; -deny 66.231.64.0/20; -deny 67.213.128.0/20; -deny 67.218.208.0/20; -deny 72.13.16.0/20; -deny 78.31.184.0/21; -deny 78.31.211.0/24; -deny 79.173.104.0/21; -deny 80.76.8.0/21; -deny 81.22.152.0/23; -deny 83.175.0.0/18; -deny 85.121.39.0/24; -deny 86.55.40.0/23; -deny 86.55.42.0/23; -deny 88.135.16.0/20; -deny 91.194.254.0/23; -deny 91.195.254.0/23; -deny 91.198.127.0/24; -deny 91.200.248.0/22; -deny 91.203.20.0/22; -deny 91.207.4.0/22; -deny 91.209.12.0/24; -deny 91.212.104.0/24; -deny 91.212.198.0/24; -deny 91.212.201.0/24; -deny 91.212.220.0/24; -deny 91.213.126.0/24; -deny 91.213.172.0/24; -deny 91.216.3.0/24; -deny 91.217.10.0/23; -deny 91.220.35.0/24; -deny 91.220.62.0/24; -deny 91.220.163.0/24; -deny 91.223.89.0/24; -deny 91.226.97.0/24; -deny 91.229.210.0/24; -deny 91.230.110.0/24; -deny 91.230.252.0/23; -deny 91.234.36.0/24; -deny 91.235.2.0/24; -deny 91.236.74.0/23; -deny 91.236.120.0/24; -deny 91.237.198.0/24; -deny 91.238.82.0/24; -deny 91.239.24.0/24; -deny 91.239.238.0/24; -deny 91.240.163.0/24; -deny 91.240.165.0/24; -deny 91.242.217.0/24; -deny 91.243.115.0/24; -deny 93.175.240.0/20; -deny 94.26.112.0/20; -deny 94.154.128.0/18; -deny 95.216.0.0/15; -deny 101.192.0.0/14; -deny 101.199.0.0/16; -deny 101.202.0.0/16; -deny 101.203.128.0/19; -deny 101.248.0.0/15; -deny 101.252.0.0/15; -deny 103.2.44.0/22; -deny 103.10.68.0/22; -deny 103.12.216.0/22; -deny 103.16.76.0/24; -deny 103.20.36.0/22; -deny 103.23.8.0/22; -deny 103.36.64.0/22; -deny 103.41.124.0/22; -deny 103.41.180.0/22; -deny 103.42.115.0/24; -deny 103.55.28.0/22; -deny 103.57.248.0/22; -deny 103.61.4.0/22; -deny 103.228.60.0/22; -deny 103.229.36.0/22; -deny 103.230.144.0/22; -deny 103.231.84.0/22; -deny 103.232.136.0/22; -deny 103.232.172.0/22; -deny 103.236.32.0/22; -deny 103.242.184.0/22; -deny 104.143.112.0/20; -deny 104.255.136.0/21; -deny 106.96.0.0/14; -deny 108.166.224.0/19; -deny 109.94.208.0/20; -deny 110.44.128.0/20; -deny 110.232.160.0/20; -deny 113.20.160.0/19; -deny 114.8.0.0/16; -deny 115.85.133.0/24; -deny 116.78.0.0/15; -deny 116.128.0.0/10; -deny 116.144.0.0/15; -deny 116.146.0.0/15; -deny 117.100.0.0/15; -deny 118.177.0.0/16; -deny 118.185.0.0/16; -deny 119.232.0.0/16; -deny 120.48.0.0/15; -deny 120.92.0.0/17; -deny 120.92.128.0/18; -deny 120.92.192.0/19; -deny 120.92.224.0/20; -deny 121.100.128.0/18; -deny 122.129.0.0/18; -deny 122.202.96.0/19; -deny 123.136.80.0/20; -deny 124.68.0.0/15; -deny 124.70.0.0/15; -deny 124.157.0.0/18; -deny 124.242.0.0/16; -deny 124.245.0.0/16; -deny 125.31.192.0/18; -deny 125.58.0.0/18; -deny 125.169.0.0/16; -deny 128.13.0.0/16; -deny 128.168.0.0/16; -deny 128.191.0.0/16; -deny 129.47.0.0/16; -deny 129.76.64.0/18; -deny 130.148.0.0/16;

@@ -1,131 +0,0 @@ -* Sun Mar 05 2016 Juergen Gotteswinter <jg@internetx.com> - 1.9.12-1 -- 1.9.12 bump -- enabled http splice module - -* Tue Dec 08 2015 Juergen Gotteswinter <jg@internetx.com> - 1.9.7-1 -- version bump 1.9.7 -- enabled http2 -- enabled thread pool support - -* Wed May 12 2015 Juergen Gotteswinter <jg@internetx.com> - 1.9.1-1 -- Version Bump 1.9.1 Codename Putin - -* Wed May 12 2015 Juergen Gotteswinter <jg@internetx.com> - 1.9.0-1 -- moved on to the current stable mainline tree 1.9.x -- enabled stream module (appeared in 1.9.0) - simple tcp proxy feature - -* Wed Mar 25 2015 Juergen Gotteswinter <jg@internetx.com> - 1.7.11-1 -- pushed bundled openssl to latest 1.0.2 -- enabled thread pool support (appeared in 1.7.11) -- updated rtmp module to latest git (previous version does not build with -- 1.7.11) - -* Thu Dec 31 2014 Juergen Gotteswinter <jg@internetx.com> - 1.7.9-2 -- added nginx pagespeed module - rhel/centos 7.x only -- added nginx pagespeed sample config -- enabled complete mainline module tree, except mail* support - -* Thu Dec 31 2014 Juergen Gotteswinter <jg@internetx.com> - 1.7.9-1 -- bumped to 1.7.9 -- fixed check upstream module + patch -- 2014 byebye version bump - -* Thu Dec 02 2014 Juergen Gotteswinter <jg@internetx.com> - 1.7.8-1 -- bumped to 1.7.8 - -* Thu Nov 13 2014 Juergen Gotteswinter <jg@internetx.com> - 1.7.7-1 -- bumped to 1.7.7 - -* Thu Oct 23 2014 Juergen Gotteswinter <jg@internetx.com> - 1.7.6-1 -- added openssl source - nginx got built static against current vanilla -* openssl -- enabled additional mainline modules -- added patch to get rid of rc4 -- bumped to 1.7.6 - -* Fri Jun 28 2014 Juergen Gotteswinter <jg@internetx.com> - 1.7.3-1 -- bump to 1.7.3 - -* Fri Apr 26 2014 Juergen Gotteswinter <jg@internetx.com> - 1.6.0-2 -- added nginx-statsd module - -* Fri Apr 26 2014 Juergen Gotteswinter <jg@internetx.com> - 1.6.0-1 -- pushed to new stable branch 1.6 - -* Fri Apr 12 2014 Juergen Gotteswinter <jg@internetx.com> - 1.4.7-2 -- added patch to log heartbleed attacks - -* Tue Apr 03 2014 Juergen Gotteswinter <jg@internetx.com> - 1.4.7-1 -- bump to 1.4.7 - -* Wed Nov 20 2013 Juergen Gotteswinter <jg@internetx.com> - 1.4.4-1 -- https://bugzilla.redhat.com/show_bug.cgi?id=1032266 - -* Tue Oct 08 2013 Carsten Schoene <cs@linux-administrator.com> - 1.4.3-1 -- update nginx to 1.4.3 -- update rtmp module to 1.0.5 - -* Sun Aug 04 2013 Carsten Schoene <cs@linux-administrator.com> - 1.4.2-2 -- update rtmp module to 1.0.2 - -* Wed Jul 17 2013 Carsten Schoene <cs@linux-administrator.com> - 1.4.2-1 -- update nginx to 1.4.2 - -* Sat Jun 29 2013 Carsten Schoene <cs@linux-administrator.com> - 1.4.1-4 -- update rtmp module to 1.0.1 - -* Sat May 25 2013 Carsten Schoene <cs@linux-administrator.com> - 1.4.1-3 -- update rtmp module to 0.9.20 - -* Mon May 13 2013 Carsten Schoene <cs@linux-administrator.com> - 1.4.1-2 -- update rtmp module to 0.9.19 - -* Fri May 10 2013 Juergen Gotteswinter <jg@internetx.de> - 1.4.1-1 -- version bump to latest stable 1.4.1 - -* Fri Apr 26 2013 Carsten Schoene <cs@linux-administrator.com> - 1.2.7-2 -- update rtmp module to 0.9.18 - -* Sun Apr 14 2013 Carsten Schoene <cs@linux-administrator.com> - 1.2.7-4 -- update nginx to 1.2.7 -- update rtmp module to 0.9.14 - -* Mon Mar 04 2013 Carsten Schoene <cs@linux-administrator.com> - 1.2.7-3 -- update rtmp module to 0.9.11 - -* Thu Feb 28 2013 Carsten Schoene <cs@linux-administrator.com> - 1.2.7-2 -- update rtmp module to 0.9.8 - -* Tue Feb 12 2013 Carsten Schoene <cs@linux-administrator.com> - 1.2.7-1 -- update nginx to 1.2.7 -- update rtmp module to 0.9.7 - -* Fri Jan 25 2013 Carsten Schoene <cs@linux-administrator.com> - 1.2.6-4 -- update rtmp module to 0.9.1 - -* Wed Jan 16 2013 Carsten Schoene <cs@linux-administrator.com> - 1.2.6-3 -- update rtmp module to 0.9.0 - -* Sat Jan 12 2013 Carsten Schoene <cs@linux-administrator.com> - 1.2.6-2 -- added rtmp 0.8.7 module - -* Tue Dec 11 2012 Carsten Schoene <cs@linux-administrator.com> - 1.2.6-1 -- update to release 1.2.6 - -* Tue Nov 13 2012 Carsten Schoene <cs@linux-administrator.com> - 1.2.5-1 -- update to release 1.2.5 - -* Mon Oct 04 2010 Juergen Gotteswinter <jg at internetx.de> 0.8.52-1 -- update to latest stable branch - -* Wed Nov 17 2009 Juergen Gotteswinter <jg at internetx.de> 0.7.64-1 - -- version bump to 0.7.64 - - -* Wed Oct 28 2009 Juergen Gotteswinter <jg at internetx.de> 0.7.63-1 - -- version bump to 0.7.63 - -* Fri Oct 23 2009 Juergen Gotteswinter <jg at internetx.de> 0.7.62-3 -- included nginx-socket-patch for unix socket support \ No newline at end of file

-(directory)

@@ -1 +0,0 @@ -ref: refs/heads/master

@@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = https://github.com/arut/nginx-rtmp-module.git -[branch "master"] - remote = origin - merge = refs/heads/master

@@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository.

-(directory)

@@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -:

@@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -}

@@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info

@@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -:

@@ -1,50 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ascii filenames set this variable to true. -allownonascii=$(git config hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ascii filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - echo "Error: Attempt to add a non-ascii file name." - echo - echo "This can cause problems if you want to work" - echo "with people on other platforms." - echo - echo "To be portable it is advisable to rename the file ..." - echo - echo "If you know what you are doing you can disable this" - echo "check using:" - echo - echo " git config hooks.allownonascii true" - echo - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against --

@@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up-to-date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -exit 0 - -################################################################ - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master".

@@ -1,36 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first comments out the -# "Conflicts:" part of a merge commit. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -case "$2,$3" in - merge,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$1" ;; - - *) ;; -esac - -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

@@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 <ref> <oldrev> <newrev>)" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 <ref> <oldrev> <newrev>" >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0

-(directory)

@@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~

-(directory)

@@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5150993accb5edefa61d71e1c81ad8c02f515428 U-arrakis\jg <jg@arrakis.(none)> 1481905161 +0100 clone: from https://github.com/arut/nginx-rtmp-module.git

-(directory)

@@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5150993accb5edefa61d71e1c81ad8c02f515428 U-arrakis\jg <jg@arrakis.(none)> 1481905161 +0100 clone: from https://github.com/arut/nginx-rtmp-module.git

-(directory)

@@ -1,369 +0,0 @@ -# pack-refs with: peeled -406d3a9527e08ea148e7c10ffa4009e0e5070b11 refs/remotes/origin/access-log -e19ff641b06d3abd30b3bad5cfb491d158835713 refs/remotes/origin/aggregate -eee52d83c4bdafe712685be06822acb051d407a7 refs/remotes/origin/async-client-handshake -87686029aa2cfddfea765c626be7161981583482 refs/remotes/origin/atc -3d5f6df7311594b051fdd26d3ae120d4ae708bb4 refs/remotes/origin/atc-only -3c2e29f215fb09e5b4cb29040d1e5e092ce73849 refs/remotes/origin/auto-push -f39d3f66a3ea6bb15b50737b90004b12056a3ad1 refs/remotes/origin/avc-parser -205664d8c5e040a61b36ae0b74ddf17bc16d2150 refs/remotes/origin/big-endian -10bcbf0e8daf38e3f3569ba84050f85fd46dd2d0 refs/remotes/origin/big-hls-buffer -fad4f4717b47ab368d80ff480f2889631edc6521 refs/remotes/origin/big-nal-buffer -f6ccfb6fa1d05d3babc1bb20ca7003802f85f2f0 refs/remotes/origin/chunksizefix -d9579d627d727d8ad5edd2a0054f66324bebd459 refs/remotes/origin/close-stream -aeae84bf8babcd7130f71b5941834eeb4fafa61a refs/remotes/origin/cmd-handler-init -ebc47f03a43758c4f44ae90c193f4111f9ab1e16 refs/remotes/origin/codec -cb4623aa4f7e6c2d1cb4c9c9f55ea6107f3a3985 refs/remotes/origin/const-fix -0b757e8a49480a88f5e051f6590f25e6c4de3288 refs/remotes/origin/control -ef424df677eb545ba5277649ee99fbea7e38bb55 refs/remotes/origin/control-director -5e5dd797c2307b40a11409df806f07a427b3cd57 refs/remotes/origin/control-redirect -b07e0e2dee3a2019dc2be34591b1c4e27730b2a0 refs/remotes/origin/dash -e8081fd94f1d7ae4483f0a5ca002af8a79d447eb refs/remotes/origin/dash-discont -fe4877f2168e7e62d6a45cb26708d662f0416961 refs/remotes/origin/dash-timeline -39717828d67359329797d0ab5f297162b5d5e248 refs/remotes/origin/default-buflen -90f985fa2f015e8bdfe92a9b57a5d04b779d7be1 refs/remotes/origin/defclose -63d19ada51b6a1932e1cd73d9895a08cb1ae7827 refs/remotes/origin/drop-old-publisher -6c79085d5c4203d11d9aa53d456ef7195de8cdc4 refs/remotes/origin/drop-restart -fe8bf2d6974834ab346b82533151bc953fdfaa7b refs/remotes/origin/drop-restart-mstat -52c2ef3f91569c3b1c10a40fd1bf56bb4dc1d9de refs/remotes/origin/enotify -57a96ac2bc1812188aa81237ad582ca115f4391f refs/remotes/origin/envivo-fix -87686029aa2cfddfea765c626be7161981583482 refs/remotes/origin/exec-fix -67aa7d5d0da67a43683e8b05467afbdff5622532 refs/remotes/origin/exec-init -f79aa206ec572c225c8bd32b5c2b1d7cc5ede692 refs/remotes/origin/exec-logging -b62651efbdcaa77f7836ef5c52ddccfdf9ca473f refs/remotes/origin/exec-pull -a6913ea68ad017eff14d098f4086c5dafae12af6 refs/remotes/origin/exec-pull-ext -8c39b37131d150f152aa21a03f076501f39bf4a1 refs/remotes/origin/exec-static -5e55f62b88f439dc1fbe311060bef53dfcfbc42e refs/remotes/origin/fast-start -0210f7ca83f8fd65261c4b9040743edf30a258fc refs/remotes/origin/flv-append-fix -fac68de376a2e20aed5627681ffc90d6374bf295 refs/remotes/origin/flv-header-mask -b31539ce95d2f84ce8be22b9d11cb4abcd3cb90a refs/remotes/origin/fmle-reset-byte-counter -990222d643b30a3c9e0db31209416ae9b47e16d3 refs/remotes/origin/fmle-time-fix -cbccd06babfc66ab920e7e2331d125516715f709 refs/remotes/origin/freebsd-auto-push -6f2808c7d11564e2269e9f64b9671f8c080c893d refs/remotes/origin/get-notify -12a0d39bed54bfb3c30272d8d1328d74378853ce refs/remotes/origin/gh-pages -76211a4bd254e5145d38c0275ad790dc9fac8fd4 refs/remotes/origin/good-logger -ec282438514e88f7267653728b42c77e3df23bc3 refs/remotes/origin/handshakefix -d34c6393f6ff22ef6cff6cb2c4ef7c1fe6cd35fa refs/remotes/origin/hls-async-delete -49a3ee0dc6d5b85fe1164995c8d94424a0971838 refs/remotes/origin/hls-base-url -4906e816bec876e3e81b129622de3f5e430dcc32 refs/remotes/origin/hls-continuous -764a039c5856bb8bfb251ff15f4c95cf1c82e54b refs/remotes/origin/hls-debug -a43bafe3de4641268d04f9105f6ef409abb8ede2 refs/remotes/origin/hls-discont-fix -8acacd0d7906820039bc5e1e22a4ba332caada3e refs/remotes/origin/hls-encrypt -7500b4bd90fc942468f94dd3a12dbcdf9c3199a6 refs/remotes/origin/hls-encrypt-auto -78dcfbcc359f8275a55b7a14d6228e9928c75816 refs/remotes/origin/hls-ensure-directory -737ea5ce34c8270479811acfacba02112e202625 refs/remotes/origin/hls-event -546c42efeb910fb6b7b592293f5737324ddd606a refs/remotes/origin/hls-granularity -2ed36a2611c1674d495f754ef3066c4a8bf98aa3 refs/remotes/origin/hls-nocache -21174b2ee743c9ea1a0bccb46436c56c871febd3 refs/remotes/origin/hls-nocrackle -6298aa7e1d95df8b806a262196a6589159284c74 refs/remotes/origin/hls-offset-fix -059dba448ddeed901d06f825ed84e5e85c0f64cc refs/remotes/origin/hls-read-playlist -0aaf2a625903ba6d4d9e1e761a0e866215149994 refs/remotes/origin/hls-restart -2bb16425da9b593f5f9568f7c91bf06a5a1012f1 refs/remotes/origin/hls-restart-on-audio -3d54d69e252bb537dc8fb03cc96ada084bd5da8d refs/remotes/origin/hls-trailer -4ff1bd09fcbd8a77618bd528fd8d32fb72bd2661 refs/remotes/origin/hls-ts-discont -2f1091679b60b8741e59f257ac2c59905cec8206 refs/remotes/origin/hls-variant -dc698edf242a1ba6d806571e2b32e50fb4d6fcae refs/remotes/origin/hlslight -7b88858b44371ae03d29052fe6d398750fba851e refs/remotes/origin/http -050a4e7586552003baff9dd920d28d51eaf8ab22 refs/remotes/origin/idle-streams -3fc1598db94b234b2ec5f368c34c5d3e877040a0 refs/remotes/origin/init_queue -d9d749af5b156ea2b4623f7e8d0efa5139885924 refs/remotes/origin/interleave -5150993accb5edefa61d71e1c81ad8c02f515428 refs/remotes/origin/master -67443c28b4aff60023ce143475c2d287c264f2f7 refs/remotes/origin/meta-copy -266e206afcda93cf2880e660fb796eb99fb6df6c refs/remotes/origin/mixed-codecs -58491f8feddbe801557704dd1d1ac9d0950cdf3f refs/remotes/origin/mp4 -af5703b35756667eb008bdffb22626616bbae020 refs/remotes/origin/mp4-choose-track -3f9451fdfd2707e91536bb3b942cd0a8202ebc31 refs/remotes/origin/mpeg-dash -05a23dbc8b8a23bcb49ea71978239ab1e2e79d5d refs/remotes/origin/mstat -cbe760aa8ad43d3908b7c9408d7f3946747981b1 refs/remotes/origin/msvc-fix1 -4ec43349ad5e16a9216844430695a3479ff6d558 refs/remotes/origin/multi-pull -004accda9aef265eb1b4df39846156e6892d6a30 refs/remotes/origin/multi-record -41515325899813d996e092ce4219204cec56ae3a refs/remotes/origin/multiplay -4ec43349ad5e16a9216844430695a3479ff6d558 refs/remotes/origin/multipull -1894d333aa9fd76e857532efe6c64d343df137e7 refs/remotes/origin/native-hls -e22ca286044d343745a4a28b15c6298f80a9fb61 refs/remotes/origin/native-hls-rr -b5461f61c6833aee803b5134f2285aa652978e09 refs/remotes/origin/new-live -903abb6646153c9eca2697727231d46804a0c1b7 refs/remotes/origin/new-live2 -02dd440a25097e8528d9cdfa85132b6920649547 refs/remotes/origin/new-live3 -22de95e634b92e23eae85134c05e54c98404e34f refs/remotes/origin/new-relay -7b5c5e99327c19600ab2bab89960ba217be52949 refs/remotes/origin/new-stat -591d7f5f3f0a2381f466f578a768ff19344cfbb0 refs/remotes/origin/newhandshake -cbaff8f1df7c7eabc9474909104f8f4f05324930 refs/remotes/origin/notify-addr -7f7fcc8d5c0e8468db2b37de9a4ef3ec392c52a7 refs/remotes/origin/notify-redirect -8d28f7f1de08a81ce356f55c6e29141369bf7aec refs/remotes/origin/notify-redirect-md5 -58bd6029463c79347d45be4488a3786abe5cebb8 refs/remotes/origin/notify-relay -f89bbae2354ea09cb5d8b04d24ba4df8415e7f09 refs/remotes/origin/on-connect -62e03d710cd02043156ac86da3b07e5186c78e11 refs/remotes/origin/on-update -15405e8edde4db9e3c6b56c3a17edbf7dcd974f0 refs/remotes/origin/optsend -9788b1a5309d40809df6832e81593392f3b381a2 refs/remotes/origin/out-metadata -2fdec454604b76b40d322b83106ec1a35b98dfce refs/remotes/origin/out-queue-settings -0478c4445f26f55d33e360a91a7ab4cd57f44f3b refs/remotes/origin/pause -940ff260099958edf27eb11fe0b959e881fd5dfa refs/remotes/origin/peer-timestamp -067c73710d15f046945ada24d5ca25d50b2751c7 refs/remotes/origin/play-publish-done -5d3189ad97c87bbdac9fb455f7505d0d4d5eb058 refs/remotes/origin/play-seek -8a8f28f3b67d0177f79e754c478e845bac70eb58 refs/remotes/origin/play2 -521f8998b0cf1e197152655b214285ebde974fd3 refs/remotes/origin/play2-continue -3e25f91004b83c1a1fa25a8993cdd691f65bf658 refs/remotes/origin/postconf-handler-init -4ec43349ad5e16a9216844430695a3479ff6d558 refs/remotes/origin/preemption -a72e33ea411ed5f55df04ea9ab9dfceb09137642 refs/remotes/origin/proxy-protocol -6ab14605ba4a410b39916543302a9a9eb4d19698 refs/remotes/origin/publish-optional-type -1c2470975e4f23742d3e468649c2ad2bbfb77e7f refs/remotes/origin/publish-time-fix2 -dbc3ac2438757b23a65e1612c36b5691e7173585 refs/remotes/origin/push-reconnect -0b6a84b0b829c6794c0635dd30a2aa6712417c8f refs/remotes/origin/record-append -abc2704db1193bd993b886463063059d1ff5050e refs/remotes/origin/record-done -8658d99529384a487113bb9b80aaffd7714f16a7 refs/remotes/origin/record-keyframes -9b3471d79f43382db134b407cfce4f5b4ee24ae0 refs/remotes/origin/record-lock -f79aa206ec572c225c8bd32b5c2b1d7cc5ede692 refs/remotes/origin/record-name-format -bff1c355ec7db875972da6682e2553d65ac847ad refs/remotes/origin/record-notify -b69efd3e94113f627f25d0ab67fcd1036eab5fb1 refs/remotes/origin/reentrant-relay -1f9072bbe69e015021a31784b3ac66f0b296c911 refs/remotes/origin/relay -c9973fc68a91284c632f3afb736303d6402f6c4e refs/remotes/origin/relay-vars -7aa513cfcd5fd345ea477ea582faa8858628974d refs/remotes/origin/reltime -de2a4258d77aecdc2fab34b5857ca4529b1fe0ba refs/remotes/origin/remote-redirect -60038b6ea15ae34dc1f177625adc73ddb39eb984 refs/remotes/origin/rooms -35753c5f6221c31edad65a2f70802b856e642fe3 refs/remotes/origin/rooms2 -4a1358723a7ce288aeec9583da97166c260b38dd refs/remotes/origin/rtmp-ads -71f92aca8d631cbc800c8eed235535e0b0a52991 refs/remotes/origin/safe-amf-parser -87d1cebfe2822d75f9c97fe2487723029abc272a refs/remotes/origin/sample-access -57dd1406bd59224eea4e0aabf9dbfe4c82e6be9a refs/remotes/origin/session-relay -22de95e634b92e23eae85134c05e54c98404e34f refs/remotes/origin/shared-live-streams -5d7a5ea535ed40e7a9459967dc607bb52b10db12 refs/remotes/origin/shared_record -18e4762db29139ada9c8be4b36070005e8d01efc refs/remotes/origin/smart-drop -a8d148473db0fe5fb17e5e7527a3cafcfafb1fff refs/remotes/origin/smartos-compilation-fix -2cff2a58210c2f964f4d2ee76a8461fb81e28610 refs/remotes/origin/stat-no-underline -e3be78bc6b6f91fea27ba235a6393dee50817bcf refs/remotes/origin/stat-redesign -3bd60857bd5ea2f3024e7de248bdc3d64b58859d refs/remotes/origin/static-relay -7a35372e30dca2a10c843219597bc4bc481fdda0 refs/remotes/origin/static-relay-cleanup -882b4f15b287b3e313088a67b2a4a543fbb6511d refs/remotes/origin/static-relay2 -ac13bbf1af345532a009a88d93ac4b7869ffe456 refs/remotes/origin/sync -9b4725a01a9615dfa7133d659ff936bd69e91345 refs/remotes/origin/sync-atc -7fbfb36440d99786f3c4ecc723ae61fcdedc3ce5 refs/remotes/origin/sync-atc-fmle -466c1fdf168646d57f0f43c463ad524143917e01 refs/remotes/origin/sync-atc-fmle2 -93b669273561ebd80fbf106b8b482d28a4377b81 refs/remotes/origin/sync-enotify -c8ad56e2d232933453d54767db55e96e00dd3d6c refs/remotes/origin/video-key -6ad152ee4c43238bd6a9f71f36b8e5a1757909a0 refs/remotes/origin/video-on-demand -b6194ed6e6a01ce14026c1778148db61a9a6765e refs/remotes/origin/virtual -4adc5f7487b0bb27cf027c3e792b00821ad30ada refs/remotes/origin/vod-http -0f337fe9a482e3da10ca7e8055ae1d8a2ccb9037 refs/remotes/origin/vod-sample-access -98d959ac5374bd14123f53318e6c8a8d481ffd92 refs/remotes/origin/vod-seek -770e67b1f33134c7db41e99f27ef167b16be8032 refs/remotes/origin/vod-stat -5db5d5af24af798f698fcc0f6eeecbac52932139 refs/remotes/origin/vod-stat2 -658f5ec639e290476f19eb91f371e2bf453616c0 refs/remotes/origin/win -289ee42c53f49728eb134f2226a2ef9ca7a32414 refs/remotes/origin/win1 -92d4c071d91b9de67e7293efcb72ad97c28285a7 refs/tags/freebsd-native-hls -^1894d333aa9fd76e857532efe6c64d343df137e7 -316b05d54e7e290546872cb26ad5b431b2a935af refs/tags/v0.0.1 -^eda826a386f10109816c57db9ed0908bdca92330 -2ba5b409dfac19e28befd698e0e03ea8f3799517 refs/tags/v0.0.10 -^d943d519754d1c08073298114807a8afb154d07f -f00415d4264d303b1a2771a3c6a36c026217e000 refs/tags/v0.0.11 -^bcd601832a0a2dc968621e065f1dbeaa14b77bb6 -3080d5f1e2f6e7b4da23585fb538152cbe91bf77 refs/tags/v0.0.12 -^caec91b85772dc5e078a3152cb6ed436c26bfbc3 -740f8034ec343eeab3c19c5e777fc1af05af12e5 refs/tags/v0.0.13 -^d3c5ad11969c6bfba083a33c5c7540d79692ab0a -18719a9ae0332480c80acac56b54e87b6131f46c refs/tags/v0.0.14 -^cf1976cd05a6e73cdf5fb1506f84508a297688b6 -903e750ce238efa3cde37a40a00c83d0efa7190b refs/tags/v0.0.15 -^6295147db1d44c9e8430b09cf2bf3d0a43c16b56 -93cd6b10d401382dfc8f740dd8e995fc5241eacc refs/tags/v0.0.16 -^359c346d3516403f5545dac0e9d8fe57ff09238e -88536319dc71fa9e8202eb000dcce7f1aa864321 refs/tags/v0.0.17 -^15405e8edde4db9e3c6b56c3a17edbf7dcd974f0 -6eba477d8578b5c488e034ab25d45e34e30636f5 refs/tags/v0.0.2 -^8204245eb223290cfed21f6748860a4bec510ed1 -4793210ff635d428fc37692d88a1107e32f3839e refs/tags/v0.0.3 -^96ebed857347b368cb78749de3515797eb0d9364 -110118d72aa68bced1a7da6d427c4a1473153f8b refs/tags/v0.0.4 -^b9ee8dbe097b2ab9cd60786c1cfa9a48237c51dd -49d4548bbc229885290915256d3b75f5d0b2863e refs/tags/v0.0.5 -^1e9a7e6efcd6990662f41e54587f27ab3f28ba87 -1c620f4121a3c4c64ccc71ca9a3aee100b702221 refs/tags/v0.0.6 -^3980a5923715131c8ac011410e63250ef5d13c93 -dbad1b31d510f290c5ebac4f073f5b7c3ef97e04 refs/tags/v0.0.7 -^7b70e9241327b93d04554cd7b8d2eeadb2acc4e6 -41ca3077bdbd20c2ddefdcc5f03a26b9ab6c358b refs/tags/v0.0.8 -^e563c3146e31eb8ce48634262435978bab26f7f0 -dc702ef73579582157563de257bf906d5ac77e18 refs/tags/v0.0.9 -^31d18ed4478684571476aed6125e942bfc738d77 -e2dcb0bea3859e6a66a7601356a7d90434d5ef4f refs/tags/v0.1.0 -^c61d7ac56f4895dc3f0513344b45d74943d4da19 -a0e0796bff7e6a33181d4cb6a1981a9889cf791c refs/tags/v0.1.1 -^f6ccfb6fa1d05d3babc1bb20ca7003802f85f2f0 -80db4c48b3cc30ad12112b5bde3831520c81a92a refs/tags/v0.1.10 -^88346934e51595118518957553316afda5a8b771 -b103795c7f1f41a51451dace848f8de085d59840 refs/tags/v0.1.11 -^45cd9825a2bb882c3b65a9c1139342bc59e40750 -8c8410a1def03c6f535110352398a0fc463d08f8 refs/tags/v0.1.12 -^63c4269a9146370db970894512523b9f3893ffad -951872e641cbebbd925c17cb8e8cc8a0289fe9cd refs/tags/v0.1.13 -^1719ef4433de03e8d95be7838a933326d717f1ee -6432ba9937589a7bbd58975d2e253a65e433e17b refs/tags/v0.1.14 -^fa3630d63d77ec4e6dcfa14a88afb5804b1b3596 -4b89a9819cc22c6ca1852613c518e0f400c6c048 refs/tags/v0.1.15 -^8def5f394543b822b6b450e79bdbf9a73f1d0a99 -40d6554b7196933e96aff91bba15f6b31c99dedb refs/tags/v0.1.2 -^4e713b75e8e3cd8f5456303e2f7f4803776f33de -a33ca7451cbd32dc2f43e01b3b87552f055a56ae refs/tags/v0.1.3 -^d82c16499de14965ff1259c457b33b5a81614c40 -dd9683b203e09b13d08e717e20304060c1d320cb refs/tags/v0.1.4 -^a4f48c5baa427c9d9093c0ceee339820c2167624 -d216f3dd61f67da413503b492af4b1f5c3e58451 refs/tags/v0.1.5 -^32279ddf26a9d9e0f34ff62d460bf4c1b14e2088 -2dab9cce52024dbf7ae3273770e159e73db21618 refs/tags/v0.1.6 -^49382c826b041589badb32b5f5f512592405a736 -c83a64c91d926c1bc5ac35036d49c31f87165466 refs/tags/v0.1.7 -^63e19f8d67d4f442f2700103c4d8ee9d137c0116 -0ab4039b703078ddacd4e70adc67b99efd946de3 refs/tags/v0.1.8 -^4bb48483be9d91a74a2efd5cb80fa136918ae466 -c9d359554132dc807d599b8d28b3193c8e37d841 refs/tags/v0.1.9 -^6143abc41803be6da47bfc4e15bbfe1d315de832 -4d20bb15480652145358c20f444f77ddbe2eeac6 refs/tags/v0.2.0 -^eb4e9e8d9033cb7c1775eec114cd7b90af26b047 -9df13315600aa2752fc99e80fb8b73a78e0f0fbf refs/tags/v0.2.1 -^1a2a8e2867f4d1cd64853bc49af9e725ee7f8343 -7e8b090de600016d965d3080b0cd6bc81eb60f67 refs/tags/v0.2.2 -^4e475cccb507951e5091f0ff5f1d4ef1903fd439 -f7f24bade80cca3a09e7286f250bb464cfab2df1 refs/tags/v0.2.3 -^295551947a187a265e5c60e6cccdf4c894a21e24 -2bf2e04da1cd97187612ba73ce9010c96393b76a refs/tags/v0.3.0 -^58491f8feddbe801557704dd1d1ac9d0950cdf3f -aded30326d7e233283346dab1258d4fdf69c31e7 refs/tags/v0.4.0 -^3c2e29f215fb09e5b4cb29040d1e5e092ce73849 -3381f10c50c161b0350ca8030535a97f43977940 refs/tags/v0.4.1 -^067c73710d15f046945ada24d5ca25d50b2751c7 -943ca88b8160225ef8decfab7aa3c6ba40c012a7 refs/tags/v0.4.2 -^ff247dafff1cab945c85ceefcf97d76fa1972c0e -2864097d4bf7e81a95bc85d133121beaf8262fc9 refs/tags/v0.4.3 -^ed5f06db8a90746059730fe8b55cf9ddc64ca67e -ed9bef4dc07d34078749b79d072cde59f385084a refs/tags/v0.5.0 -^abc2704db1193bd993b886463063059d1ff5050e -eb94d37c69842eb563fa3e7c9cc286cc942fd2e8 refs/tags/v0.5.1 -^6485716fb4734d5fc25ba12d849e2dedab63707d -0b020f1757f052a24a4d4c2061fcc4f8e1dbd440 refs/tags/v0.5.2 -^87686029aa2cfddfea765c626be7161981583482 -053bdc9277034a6db7edcc3d46c042ab8c62989b refs/tags/v0.5.3 -^cc632eb6b683eacdced09bfbe905e510779d5efc -307f468efdffa4ad07e79c0e39eab9f9eb195307 refs/tags/v0.5.4 -^bff1c355ec7db875972da6682e2553d65ac847ad -98438d54995ad4d11d7a020ff6b77919ca368448 refs/tags/v0.6.0 -^72d175ed7f5dfb4874ac6e002b737d866a0553d7 -f1eeb39f851366614b7dc1afa1fba21e1595475f refs/tags/v0.6.1 -^21174b2ee743c9ea1a0bccb46436c56c871febd3 -2b20008d1f3cb4b357d74ee288e2c00ac801d415 refs/tags/v0.6.2 -^795c1538a3602d5eedf7617c6d13c775721a66b9 -6b1f2547203b946cbac8c60bd86e5f04ad1a9a1d refs/tags/v0.6.3 -^c86e30fd270103b00c244f136c8780fb3a51b921 -d623935695e9ac6418a1baa24283bd35a42fef81 refs/tags/v0.6.4 -^f65f07deb32565b144e22faece57638f8961d62f -d3a7be773484e670119dfa20ff56cb0a91a8554f refs/tags/v0.6.5 -^4adc5f7487b0bb27cf027c3e792b00821ad30ada -293ebabd1220ec4615e2eb89d19ca3e7a381d1a3 refs/tags/v0.7.0 -^101b43a478bb44018733e75a3bf3b1f8adc5b2e5 -4b12afb07c889648864458c3a6096dc274c7420e refs/tags/v0.7.1 -^98d959ac5374bd14123f53318e6c8a8d481ffd92 -eb5ccb5fb1f735b82da3a43ee0d8d398bd932840 refs/tags/v0.7.2 -^6f2808c7d11564e2269e9f64b9671f8c080c893d -23fe9e844ecafd18a5d713618a36fb68846db951 refs/tags/v0.7.3 -^62e03d710cd02043156ac86da3b07e5186c78e11 -09b1e2bab6467a8d50e37939b4d1fc0b9777adfd refs/tags/v0.7.4 -^696e488ecb089236a297939248d4616d4665d347 -fa8752466e94879be074386c2f0420640cec3b41 refs/tags/v0.8.0 -^02dd440a25097e8528d9cdfa85132b6920649547 -7c3df8e2c78a85ef7f5d2e8f100e5f54573c71c7 refs/tags/v0.8.1 -^9f4296c08382b1374018346cce3bb5d40036f47a -f8899c67c2508ded911a93117b3186df6df631bd refs/tags/v0.8.2 -^ac924d7f940f05063d7ef0503aa7f3a1576bf380 -683a29d4d0a536b6a97c07d1deeacb8cc11a6af7 refs/tags/v0.8.3 -^3d54d69e252bb537dc8fb03cc96ada084bd5da8d -2aeefa379b700de0c9c1b4ed94e186e0d1d1a580 refs/tags/v0.8.4 -^f2f28cbe487883caed333ffb4f5f7942bed64c09 -5ea2a003691a63630e6c1d492c96d6581338efb8 refs/tags/v0.8.5 -^bd562e4ff7c10cad71711828548cbb584bd4a80b -11ee9f81e8b8a077113cdf96d655d7cf9961a03d refs/tags/v0.8.6 -^e5e5766ebb51e1c36b6804fe0ddc02ee8ca19cc6 -544c73b3b27c93df0d61172c62a7eee2e8252953 refs/tags/v0.8.7 -^3eaa43a7a327646acdebe87000422c6fd086adbe -83055d17d104c267aeebda070246b0917dbfffb2 refs/tags/v0.9.0 -^406d3a9527e08ea148e7c10ffa4009e0e5070b11 -37a1511c0e7c6a1a522bab7355289a71a7876ad2 refs/tags/v0.9.1 -^ea65ac688cdd89dad65bcdc3b62d5e152b47f1ec -ee0df070f78e83f3857301aa0e4340c15743403d refs/tags/v0.9.10 -^6923889e5386abad1aa07e2c29462fc469d3a5d4 -cb5e1df91a1b8d020de63d6cbbacd9f74097a375 refs/tags/v0.9.11 -^3aa528fccd2c3500b2eeafa6589c3f8f07564186 -6d328d3291833a9991cb27df45d1c82cfc3bc5fb refs/tags/v0.9.12 -^11e3f53fd259f0297a4d8f440afceb8395b45622 -b63100856c3a795440047324aaf863c6339e859f refs/tags/v0.9.13 -^0a8f0ee6c560edc032f66a25d527e9cd7ed6b62b -e13bcdadf3b57f91e8eca678846480522eb214ba refs/tags/v0.9.14 -^612fc4dd7514b3da2ac774a6daeb7baa60314f36 -1c92b49d30e7215483d5c0c038da2d09d6ac1d16 refs/tags/v0.9.15 -^7b5c5e99327c19600ab2bab89960ba217be52949 -bc3fe7a8ebf166e5187f7bac00c70e40a9b192fe refs/tags/v0.9.16 -^c0fc4bbdccf1d328eaa098f3287e427e369517c0 -d5288d89f8c1e1c8c82218a23deedfabb845fa1c refs/tags/v0.9.17 -^f79aa206ec572c225c8bd32b5c2b1d7cc5ede692 -bce7ea3e62682b29d61d56cc6bcc0e794857d557 refs/tags/v0.9.18 -^c61e99a36878fc618e29633db0e9652be13f6284 -39cb7ca0a51e7e4bfc400b285141a71ac7b565c7 refs/tags/v0.9.19 -^a47b23204b43d5b823feeb52b0c868b2c96847ca -43dd6489282d965072eb48479af5e8d90ac6ad38 refs/tags/v0.9.2 -^af5703b35756667eb008bdffb22626616bbae020 -73e60038c62b281fd0e4ff5565f35797fed46a1a refs/tags/v0.9.20 -^e29e64ed7d262904d22ce0a708e67cc02115f497 -828fcd80c23df5caf0b7fdbf897ba45a92f3dce7 refs/tags/v0.9.3 -^aeae84bf8babcd7130f71b5941834eeb4fafa61a -31f684d189aec37550e82e4c7cf3ac751a781ade refs/tags/v0.9.4 -^f358a2e8f9269afef85d82549de4945942b39d6c -63540cc06386523c08857cf435ad9c2f6daaef8a refs/tags/v0.9.5 -^c0ad999f37675dd1bbed11d901f34259827bb405 -e7fe15e6ca0cb0f81ec42b5b309ce6f720525193 refs/tags/v0.9.6 -^5325df0135c467d21cf93cd5c5df6af60a87a9e8 -0dda255fe75318707bb20e0078ace6da1f160cd2 refs/tags/v0.9.7 -^138c330da2ace7617af3c6b671fbee049f387fb7 -568ce8f0a850d3d7e00c33247edffe366cff0d51 refs/tags/v0.9.8 -^6903ac23e430b4170b108bb2f631562560c37fe0 -2d5bc52527e46171d2e2a7c4d9c87fa2a4e39fee refs/tags/v0.9.9 -^af8446a0985ba76873c25a6aae5125e47c7a3194 -d27f964d1f45d546419795b058fea60f3f1f21ab refs/tags/v1.0.0 -^613234b866fd08ea2221d183edfd9eb6d8a8bf4d -421d9ff41f699cc344845df9869dccff0ce4ad86 refs/tags/v1.0.1 -^cbe760aa8ad43d3908b7c9408d7f3946747981b1 -e1ec6d2f08937878a985bfa7d4f49e93312dc7e0 refs/tags/v1.0.2 -^6b92cd6b29ddeea5a113b6e5d8d854b6986e3fd1 -7749d54fb000641dfa6c8eebfb8765175f187a13 refs/tags/v1.0.3 -^7b4df729c1c4d86589f8ccadc0bd20ee733416f9 -aaeca4ff01f858cd719ea5b86eef7dcc3ba259ca refs/tags/v1.0.4 -^67443c28b4aff60023ce143475c2d287c264f2f7 -d7e1af79c4d152d16bcacfcd2ca18d58e6b3201b refs/tags/v1.0.5 -^737ea5ce34c8270479811acfacba02112e202625 -0acf1123a044c8afd68112387712abd59e45a2eb refs/tags/v1.0.6 -^1cfb7aeb582789f3b15a03da5b662d1811e2a3f1 -bd4f1b4cf7c58e55298c326184e5ad1a15c3aff0 refs/tags/v1.0.7 -^995688b9cfea4fb01a5b8ad0e110fec0866e501c -5beda43a6b388af5e7c1bcc55384163d97dcf836 refs/tags/v1.0.8 -^d01ffc0c88d9ce736be3dee99b4f9d3fcc07b685 -f792dab070dbdedc3b968483287fa59e6ae48a03 refs/tags/v1.0.9 -^471d299f5d5348dfbba6132779587553c3a709a7 -a08c7835b05e2bd816efb1f8036cb7c9bf59b906 refs/tags/v1.1.0 -^8542e21e17587ee2e928cdfedc1cb82996df7719 -e9d11158cb1b18a0631a94c4e8599c0f8c64adb7 refs/tags/v1.1.1 -^8608faad1e0b25c80b1f9b93439d6fd450db5c15 -cf710155b2666d2456a58a49dac1af4d93b215ce refs/tags/v1.1.10 -^5150993accb5edefa61d71e1c81ad8c02f515428 -2a721794867c76e9ac9e653e76da9503cbc9d60f refs/tags/v1.1.2 -^65cd61e43350c0de0a69103aed1ecf7f2b081ab8 -c130de320738a9ae084ba3d54f033c98e6e82d65 refs/tags/v1.1.3 -^6f768dc4eb2a2cb7798e31c7465af77b94ca2733 -3fdbbcc01249d7a3f0559192debfe09f844aef6e refs/tags/v1.1.4 -^8c2229cce5d4d4574e8fb7b130281497f746f0fa -28618cde22c864eef6ecdba9da636a2f2f611b20 refs/tags/v1.1.5 -^7500b4bd90fc942468f94dd3a12dbcdf9c3199a6 -1706bc84f5b0882dec6f1854d9054be7e3d12ab2 refs/tags/v1.1.6 -^7a35372e30dca2a10c843219597bc4bc481fdda0 -c0a5fb42c214d585a84967b2e172889d9278d325 refs/tags/v1.1.7 -^f62a0838064baf089ad9fe3c8f6f2ffe0775afb2 -1fe006d50fbca7537984fc080dd32906b9cb5455 refs/tags/v1.1.8 -^cb54ed4ac0994e36b92d21a51313af44ecdfdadd -c7447b49ee18232dab330fadf6c2dfb5fa2bbfb2 refs/tags/v1.1.9 -^c0bf381d10de05c135f913921c58272838d5e1ee

-(directory)

@@ -1 +0,0 @@ -5150993accb5edefa61d71e1c81ad8c02f515428

-(directory)

@@ -1 +0,0 @@ -ref: refs/remotes/origin/master

-(directory)

@@ -1,197 +0,0 @@ - -/* - * Copyright (C) Roman Arutyunyan - */ - - -#include <ngx_config.h> -#include <ngx_core.h> -#include <nginx.h> -#include "ngx_rtmp_proxy_protocol.h" - - -static void ngx_rtmp_proxy_protocol_recv(ngx_event_t *rev); - - -void -ngx_rtmp_proxy_protocol(ngx_rtmp_session_t *s) -{ - ngx_event_t *rev; - ngx_connection_t *c; - - c = s->connection; - rev = c->read; - rev->handler = ngx_rtmp_proxy_protocol_recv; - - ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, - "proxy_protocol: start"); - - if (rev->ready) { - /* the deferred accept(), rtsig, aio, iocp */ - - if (ngx_use_accept_mutex) { - ngx_post_event(rev, &ngx_posted_events); - return; - } - - rev->handler(rev); - return; - } - - ngx_add_timer(rev, s->timeout); - - if (ngx_handle_read_event(rev, 0) != NGX_OK) { - ngx_rtmp_finalize_session(s); - return; - } -} - - -static void -ngx_rtmp_proxy_protocol_recv(ngx_event_t *rev) -{ - u_char buf[107], *p, *pp, *text; - size_t len; - ssize_t n; - ngx_err_t err; - ngx_int_t i; - ngx_addr_t addr; - ngx_connection_t *c; - ngx_rtmp_session_t *s; - - c = rev->data; - s = c->data; - - if (c->destroyed) { - return; - } - - if (rev->timedout) { - ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, - "proxy_protocol: recv: client timed out"); - c->timedout = 1; - ngx_rtmp_finalize_session(s); - return; - } - - if (rev->timer_set) { - ngx_del_timer(rev); - } - - n = recv(c->fd, (char *) buf, sizeof(buf), MSG_PEEK); - - err = ngx_socket_errno; - - ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0, "recv(): %d", n); - - if (n == -1) { - - if (err == NGX_EAGAIN) { - ngx_add_timer(rev, s->timeout); - - if (ngx_handle_read_event(c->read, 0) != NGX_OK) { - ngx_rtmp_finalize_session(s); - } - - return; - } - - ngx_rtmp_finalize_session(s); - - return; - } - - p = buf; - - if (n <= 8 && ngx_strncmp(p, "PROXY ", 6) != 0) { - goto bad_header; - } - - n -= 6; - p += 6; - - ngx_memzero(&addr, sizeof(ngx_addr_t)); - - if (n >= 7 && ngx_strncmp(p, "UNKNOWN", 7) == 0) { - n -= 7; - p += 7; - goto skip; - } - - if (n < 5 || ngx_strncmp(p, "TCP", 3) != 0 - || (p[3] != '4' && p[3] != '6') || p[4] != ' ') - { - goto bad_header; - } - - n -= 5; - p += 5; - - pp = ngx_strlchr(p, p + n, ' '); - - if (pp == NULL) { - goto bad_header; - } - - if (ngx_parse_addr(s->connection->pool, &addr, p, pp - p) != NGX_OK) { - goto bad_header; - } - - n -= pp - p; - p = pp; - -skip: - - for (i = 0; i + 1 < n; i++) { - if (p[i] == CR && p[i + 1] == LF) { - break; - } - } - - if (i + 1 >= n) { - goto bad_header; - } - - n = p - buf + i + 2; - - if (c->recv(c, buf, n) != n) { - goto failed; - } - - if (addr.socklen) { - text = ngx_palloc(s->connection->pool, NGX_SOCKADDR_STRLEN); - - if (text == NULL) { - goto failed; - } - - len = ngx_sock_ntop(addr.sockaddr, -#if (nginx_version >= 1005003) - addr.socklen, -#endif - text, NGX_SOCKADDR_STRLEN, 0); - if (len == 0) { - goto failed; - } - - c->sockaddr = addr.sockaddr; - c->socklen = addr.socklen; - c->addr_text.data = text; - c->addr_text.len = len; - - ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0, - "proxy_protocol: remote_addr:'%V'", &c->addr_text); - } - - ngx_rtmp_handshake(s); - - return; - -bad_header: - - ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxy_protocol: bad header"); - -failed: - - ngx_rtmp_finalize_session(s); -}

@@ -1,19 +0,0 @@ - -/* - * Copyright (C) Roman Arutyunyan - */ - - -#ifndef _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_ -#define _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_ - - -#include <ngx_config.h> -#include <ngx_core.h> -#include "ngx_rtmp.h" - - -void ngx_rtmp_proxy_protocol(ngx_rtmp_session_t *c); - - -#endif /* _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_ */

@@ -245,7 +245,7 @@ # HLS - # For HLS to work please create a directory in tmpfs (/tmp/hls here) + # For HLS to work please create a directory in tmpfs (/tmp/app here) # for the fragments. The directory contents is served via HTTP (see # http{} section in config) #

@@ -1,6 +1,6 @@ ngx_addon_name="ngx_rtmp_module" -RTMP_CORE_MODULES=" \ +CORE_MODULES="$CORE_MODULES ngx_rtmp_module \ ngx_rtmp_core_module \ ngx_rtmp_cmd_module \ @@ -15,7 +15,6 @@ ngx_rtmp_relay_module \ ngx_rtmp_exec_module \ ngx_rtmp_auto_push_module \ - ngx_rtmp_auto_push_index_module \ ngx_rtmp_notify_module \ ngx_rtmp_log_module \ ngx_rtmp_limit_module \ @@ -24,13 +23,13 @@ " -RTMP_HTTP_MODULES=" \ +HTTP_MODULES="$HTTP_MODULES \ ngx_rtmp_stat_module \ ngx_rtmp_control_module \ " -RTMP_DEPS=" \ +NGX_ADDON_DEPS="$NGX_ADDON_DEPS \ $ngx_addon_dir/ngx_rtmp_amf.h \ $ngx_addon_dir/ngx_rtmp_bandwidth.h \ $ngx_addon_dir/ngx_rtmp_cmd_module.h \ @@ -45,13 +44,12 @@ $ngx_addon_dir/ngx_rtmp_relay_module.h \ $ngx_addon_dir/ngx_rtmp_streams.h \ $ngx_addon_dir/ngx_rtmp_bitop.h \ - $ngx_addon_dir/ngx_rtmp_proxy_protocol.h \ $ngx_addon_dir/hls/ngx_rtmp_mpegts.h \ $ngx_addon_dir/dash/ngx_rtmp_mp4.h \ " -RTMP_CORE_SRCS=" \ +NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ $ngx_addon_dir/ngx_rtmp.c \ $ngx_addon_dir/ngx_rtmp_init.c \ $ngx_addon_dir/ngx_rtmp_handshake.c \ @@ -71,6 +69,8 @@ $ngx_addon_dir/ngx_rtmp_flv_module.c \ $ngx_addon_dir/ngx_rtmp_mp4_module.c \ $ngx_addon_dir/ngx_rtmp_netcall_module.c \ + $ngx_addon_dir/ngx_rtmp_stat_module.c \ + $ngx_addon_dir/ngx_rtmp_control_module.c \ $ngx_addon_dir/ngx_rtmp_relay_module.c \ $ngx_addon_dir/ngx_rtmp_bandwidth.c \ $ngx_addon_dir/ngx_rtmp_exec_module.c \ @@ -79,55 +79,12 @@ $ngx_addon_dir/ngx_rtmp_log_module.c \ $ngx_addon_dir/ngx_rtmp_limit_module.c \ $ngx_addon_dir/ngx_rtmp_bitop.c \ - $ngx_addon_dir/ngx_rtmp_proxy_protocol.c \ $ngx_addon_dir/hls/ngx_rtmp_hls_module.c \ $ngx_addon_dir/dash/ngx_rtmp_dash_module.c \ $ngx_addon_dir/hls/ngx_rtmp_mpegts.c \ $ngx_addon_dir/dash/ngx_rtmp_mp4.c \ " - - -RTMP_HTTP_SRCS=" \ - $ngx_addon_dir/ngx_rtmp_stat_module.c \ - $ngx_addon_dir/ngx_rtmp_control_module.c \ - " - -if [ -f auto/module ] ; then - ngx_module_incs=$ngx_addon_dir - ngx_module_deps=$RTMP_DEPS - - if [ $ngx_module_link = DYNAMIC ] ; then - ngx_module_name="$RTMP_CORE_MODULES $RTMP_HTTP_MODULES" - ngx_module_srcs="$RTMP_CORE_SRCS $RTMP_HTTP_SRCS" - - . auto/module - - else - ngx_module_type=CORE - ngx_module_name=$RTMP_CORE_MODULES - ngx_module_srcs=$RTMP_CORE_SRCS - - . auto/module - - - ngx_module_type=HTTP - ngx_module_name=$RTMP_HTTP_MODULES - ngx_module_incs= - ngx_module_deps= - ngx_module_srcs=$RTMP_HTTP_SRCS - - . auto/module - fi - -else - CORE_MODULES="$CORE_MODULES $RTMP_CORE_MODULES" - HTTP_MODULES="$HTTP_MODULES $RTMP_HTTP_MODULES" - - NGX_ADDON_DEPS="$NGX_ADDON_DEPS $RTMP_DEPS" - NGX_ADDON_SRCS="$NGX_ADDON_SRCS $RTMP_CORE_SRCS $RTMP_HTTP_SRCS" - - CFLAGS="$CFLAGS -I$ngx_addon_dir" -fi +CFLAGS="$CFLAGS -I$ngx_addon_dir" USE_OPENSSL=YES

@@ -412,7 +412,7 @@ p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_AUDIO, &ctx->name, codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC ? - (codec_ctx->aac_sbr ? "40.5" : "40.2") : "6b", + "40.2" : "6b", codec_ctx->sample_rate, (ngx_uint_t) (codec_ctx->audio_data_rate * 1000), name, sep, @@ -1413,22 +1413,14 @@ } -#if (nginx_version >= 1011005) -static ngx_msec_t -#else static time_t -#endif ngx_rtmp_dash_cleanup(void *data) { ngx_rtmp_dash_cleanup_t *cleanup = data; ngx_rtmp_dash_cleanup_dir(&cleanup->path, cleanup->playlen); -#if (nginx_version >= 1011005) - return cleanup->playlen * 2; -#else return cleanup->playlen / 500; -#endif }

@@ -25,8 +25,6 @@ static char * ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf, void *parent, void *child); static ngx_int_t ngx_rtmp_hls_flush_audio(ngx_rtmp_session_t *s); -static ngx_int_t ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s, - ngx_str_t *path); #define NGX_RTMP_HLS_BUFSIZE (1024*1024) @@ -35,7 +33,6 @@ typedef struct { uint64_t id; - uint64_t key_id; double duration; unsigned active:1; unsigned discont:1; /* before */ @@ -51,26 +48,22 @@ typedef struct { unsigned opened:1; - ngx_rtmp_mpegts_file_t file; + ngx_file_t file; ngx_str_t playlist; ngx_str_t playlist_bak; ngx_str_t var_playlist; ngx_str_t var_playlist_bak; ngx_str_t stream; - ngx_str_t keyfile; ngx_str_t name; - u_char key[16]; uint64_t frag; uint64_t frag_ts; - uint64_t key_id; ngx_uint_t nfrags; ngx_rtmp_hls_frag_t *frags; /* circular 2 * winfrags + 1 */ ngx_uint_t audio_cc; ngx_uint_t video_cc; - ngx_uint_t key_frags; uint64_t aframe_base; uint64_t aframe_num; @@ -85,7 +78,6 @@ typedef struct { ngx_str_t path; ngx_msec_t playlen; - ngx_uint_t frags_per_key; } ngx_rtmp_hls_cleanup_t; @@ -109,11 +101,6 @@ ngx_flag_t cleanup; ngx_array_t *variant; ngx_str_t base_url; - ngx_int_t granularity; - ngx_flag_t keys; - ngx_str_t key_path; - ngx_str_t key_url; - ngx_uint_t frags_per_key; } ngx_rtmp_hls_app_conf_t; @@ -273,41 +260,6 @@ offsetof(ngx_rtmp_hls_app_conf_t, base_url), NULL }, - { ngx_string("hls_fragment_naming_granularity"), - NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, - NGX_RTMP_APP_CONF_OFFSET, - offsetof(ngx_rtmp_hls_app_conf_t, granularity), - NULL }, - - { ngx_string("hls_keys"), - NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1, - ngx_conf_set_flag_slot, - NGX_RTMP_APP_CONF_OFFSET, - offsetof(ngx_rtmp_hls_app_conf_t, keys), - NULL }, - - { ngx_string("hls_key_path"), - NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1, - ngx_conf_set_str_slot, - NGX_RTMP_APP_CONF_OFFSET, - offsetof(ngx_rtmp_hls_app_conf_t, key_path), - NULL }, - - { ngx_string("hls_key_url"), - NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1, - ngx_conf_set_str_slot, - NGX_RTMP_APP_CONF_OFFSET, - offsetof(ngx_rtmp_hls_app_conf_t, key_url), - NULL }, - - { ngx_string("hls_fragments_per_key"), - NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, - NGX_RTMP_APP_CONF_OFFSET, - offsetof(ngx_rtmp_hls_app_conf_t, frags_per_key), - NULL }, - ngx_null_command }; @@ -484,15 +436,14 @@ { static u_char buffer[1024]; ngx_fd_t fd; - u_char *p, *end; + u_char *p; ngx_rtmp_hls_ctx_t *ctx; ssize_t n; ngx_rtmp_hls_app_conf_t *hacf; ngx_rtmp_hls_frag_t *f; ngx_uint_t i, max_frag; - ngx_str_t name_part, key_name_part; - uint64_t prev_key_id; - const char *sep, *key_sep; + ngx_str_t name_part; + const char *sep; hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module); @@ -517,19 +468,15 @@ } } - p = buffer; - end = p + sizeof(buffer); - - p = ngx_slprintf(p, end, + p = ngx_snprintf(buffer, sizeof(buffer), "#EXTM3U\n" "#EXT-X-VERSION:3\n" "#EXT-X-MEDIA-SEQUENCE:%uL\n" - "#EXT-X-TARGETDURATION:%ui\n", - ctx->frag, max_frag); - - if (hacf->type == NGX_RTMP_HLS_TYPE_EVENT) { - p = ngx_slprintf(p, end, "#EXT-X-PLAYLIST-TYPE: EVENT\n"); - } + "#EXT-X-TARGETDURATION:%ui\n" + "%s", + ctx->frag, max_frag, + hacf->type == NGX_RTMP_HLS_TYPE_EVENT ? + "#EXT-X-PLAYLIST-TYPE: EVENT\n" : ""); n = ngx_write_fd(fd, buffer, p - buffer); if (n < 0) { @@ -541,42 +488,20 @@ } sep = hacf->nested ? (hacf->base_url.len ? "/" : "") : "-"; - key_sep = hacf->nested ? (hacf->key_url.len ? "/" : "") : "-"; name_part.len = 0; if (!hacf->nested || hacf->base_url.len) { name_part = ctx->name; } - key_name_part.len = 0; - if (!hacf->nested || hacf->key_url.len) { - key_name_part = ctx->name; - } - - prev_key_id = 0; - for (i = 0; i < ctx->nfrags; i++) { f = ngx_rtmp_hls_get_frag(s, i); - p = buffer; - end = p + sizeof(buffer); - - if (f->discont) { - p = ngx_slprintf(p, end, "#EXT-X-DISCONTINUITY\n"); - } - - if (hacf->keys && (i == 0 || f->key_id != prev_key_id)) { - p = ngx_slprintf(p, end, "#EXT-X-KEY:METHOD=AES-128," - "URI=\"%V%V%s%uL.key\",IV=0x%032XL\n", - &hacf->key_url, &key_name_part, - key_sep, f->key_id, f->key_id); - } - - prev_key_id = f->key_id; - - p = ngx_slprintf(p, end, + p = ngx_snprintf(buffer, sizeof(buffer), + "%s" "#EXTINF:%.3f,\n" "%V%V%s%uL.ts\n", + f->discont ? "#EXT-X-DISCONTINUITY\n" : "", f->duration, &hacf->base_url, &name_part, sep, f->id); ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, @@ -821,16 +746,17 @@ ngx_rtmp_hls_ctx_t *ctx; ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module); - if (ctx == NULL || !ctx->opened) { + if (!ctx->opened) { return NGX_OK; } ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "hls: close fragment n=%uL", ctx->frag); - ngx_rtmp_mpegts_close_file(&ctx->file); + ngx_close_file(ctx->file.fd); ctx->opened = 0; + ctx->file.fd = NGX_INVALID_FILE; ngx_rtmp_hls_next_frag(s); @@ -844,109 +770,43 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts, ngx_int_t discont) { - uint64_t id; - ngx_fd_t fd; - ngx_uint_t g; - ngx_rtmp_hls_ctx_t *ctx; - ngx_rtmp_hls_frag_t *f; - ngx_rtmp_hls_app_conf_t *hacf; + ngx_rtmp_hls_ctx_t *ctx; + ngx_rtmp_hls_frag_t *f; + uint64_t id; ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module); - if (ctx->opened) { return NGX_OK; } - hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module); - - if (ngx_rtmp_hls_ensure_directory(s, &hacf->path) != NGX_OK) { - return NGX_ERROR; - } - - if (hacf->keys && - ngx_rtmp_hls_ensure_directory(s, &hacf->key_path) != NGX_OK) - { - return NGX_ERROR; - } - id = ngx_rtmp_hls_get_fragment_id(s, ts); - if (hacf->granularity) { - g = (ngx_uint_t) hacf->granularity; - id = (uint64_t) (id / g) * g; - } + *ngx_sprintf(ctx->stream.data + ctx->stream.len, "%uL.ts", id) = 0; - ngx_sprintf(ctx->stream.data + ctx->stream.len, "%uL.ts%Z", id); + ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, + "hls: open fragment file='%s', frag=%uL, n=%ui, time=%uL, " + "discont=%i", + ctx->stream.data, ctx->frag, ctx->nfrags, ts, discont); - if (hacf->keys) { - if (ctx->key_frags == 0) { + ngx_memzero(&ctx->file, sizeof(ctx->file)); - ctx->key_frags = hacf->frags_per_key - 1; - ctx->key_id = id; + ctx->file.log = s->connection->log; - if (RAND_bytes(ctx->key, 16) < 0) { - ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "hls: failed to create key"); - return NGX_ERROR; - } - - ngx_sprintf(ctx->keyfile.data + ctx->keyfile.len, "%uL.key%Z", id); - - fd = ngx_open_file(ctx->keyfile.data, NGX_FILE_WRONLY, - NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS); + ngx_str_set(&ctx->file.name, "hls"); - if (fd == NGX_INVALID_FILE) { - ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno, - "hls: failed to open key file '%s'", - ctx->keyfile.data); - return NGX_ERROR; - } - - if (ngx_write_fd(fd, ctx->key, 16) != 16) { - ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno, - "hls: failed to write key file '%s'", - ctx->keyfile.data); - ngx_close_file(fd); - return NGX_ERROR; - } + ctx->file.fd = ngx_open_file(ctx->stream.data, NGX_FILE_WRONLY, + NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS); - ngx_close_file(fd); - - } else { - if (hacf->frags_per_key) { - ctx->key_frags--; - } - - if (ngx_set_file_time(ctx->keyfile.data, 0, ngx_cached_time->sec) - != NGX_OK) - { - ngx_log_error(NGX_LOG_ALERT, s->connection->log, ngx_errno, - ngx_set_file_time_n " '%s' failed", - ctx->keyfile.data); - } - } - } - - ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, - "hls: open fragment file='%s', keyfile='%s', " - "frag=%uL, n=%ui, time=%uL, discont=%i", - ctx->stream.data, - ctx->keyfile.data ? ctx->keyfile.data : (u_char *) "", - ctx->frag, ctx->nfrags, ts, discont); - - if (hacf->keys && - ngx_rtmp_mpegts_init_encryption(&ctx->file, ctx->key, 16, ctx->key_id) - != NGX_OK) - { - ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "hls: failed to initialize hls encryption"); + if (ctx->file.fd == NGX_INVALID_FILE) { + ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno, + "hls: error creating fragment file"); return NGX_ERROR; } - if (ngx_rtmp_mpegts_open_file(&ctx->file, ctx->stream.data, - s->connection->log) - != NGX_OK) - { + if (ngx_rtmp_mpegts_write_header(&ctx->file) != NGX_OK) { + ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno, + "hls: error writing fragment header"); + ngx_close_file(ctx->file.fd); return NGX_ERROR; } @@ -959,7 +819,6 @@ f->active = 1; f->discont = discont; f->id = id; - f->key_id = ctx->key_id; ctx->frag_ts = ts; @@ -978,11 +837,11 @@ ngx_file_t file; ssize_t ret; off_t offset; - u_char *p, *last, *end, *next, *pa, *pp, c; + u_char *p, *last, *end, *next, *pa; ngx_rtmp_hls_frag_t *f; double duration; ngx_int_t discont; - uint64_t mag, key_id, base; + uint64_t mag; static u_char buffer[4096]; ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module); @@ -1004,7 +863,6 @@ f = NULL; duration = 0; discont = 0; - key_id = 0; for ( ;; ) { @@ -1048,54 +906,6 @@ } -#define NGX_RTMP_XKEY "#EXT-X-KEY:" -#define NGX_RTMP_XKEY_LEN (sizeof(NGX_RTMP_XKEY) - 1) - - if (ngx_memcmp(p, NGX_RTMP_XKEY, NGX_RTMP_XKEY_LEN) == 0) { - - /* recover key id from initialization vector */ - - key_id = 0; - base = 1; - pp = last - 1; - - for ( ;; ) { - if (pp < p) { - ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "hls: failed to read key id"); - break; - } - - c = *pp; - if (c == 'x') { - break; - } - - if (c >= '0' && c <= '9') { - c -= '0'; - goto next; - } - - c |= 0x20; - - if (c >= 'a' && c <= 'f') { - c -= 'a' - 10; - goto next; - } - - ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "hls: bad character in key id"); - break; - - next: - - key_id += base * c; - base *= 0x10; - pp--; - } - } - - #define NGX_RTMP_EXTINF "#EXTINF:" #define NGX_RTMP_EXTINF_LEN (sizeof(NGX_RTMP_EXTINF) - 1) @@ -1146,8 +956,6 @@ mag *= 10; } - f->key_id = key_id; - ngx_rtmp_hls_next_frag(s); ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, @@ -1167,53 +975,51 @@ static ngx_int_t -ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s, ngx_str_t *path) +ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s) { size_t len; ngx_file_info_t fi; ngx_rtmp_hls_ctx_t *ctx; ngx_rtmp_hls_app_conf_t *hacf; - static u_char zpath[NGX_MAX_PATH + 1]; + static u_char path[NGX_MAX_PATH + 1]; hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module); - if (path->len + 1 > sizeof(zpath)) { - ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "hls: too long path"); - return NGX_ERROR; - } - - ngx_snprintf(zpath, sizeof(zpath), "%V%Z", path); + *ngx_snprintf(path, sizeof(path) - 1, "%V", &hacf->path) = 0; - if (ngx_file_info(zpath, &fi) == NGX_FILE_ERROR) { + if (ngx_file_info(path, &fi) == NGX_FILE_ERROR) { if (ngx_errno != NGX_ENOENT) { ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno, - "hls: " ngx_file_info_n " failed on '%V'", path); + "hls: " ngx_file_info_n " failed on '%V'", + &hacf->path); return NGX_ERROR; } /* ENOENT */ - if (ngx_create_dir(zpath, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) { + if (ngx_create_dir(path, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno, - "hls: " ngx_create_dir_n " failed on '%V'", path); + "hls: " ngx_create_dir_n " failed on '%V'", + &hacf->path); return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, - "hls: directory '%V' created", path); + "hls: directory '%V' created", &hacf->path); } else { if (!ngx_is_dir(&fi)) { ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "hls: '%V' exists and is not a directory", path); + "hls: '%V' exists and is not a directory", + &hacf->path); return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, - "hls: directory '%V' exists", path); + "hls: directory '%V' exists", &hacf->path); } if (!hacf->nested) { @@ -1222,49 +1028,44 @@ ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module); - len = path->len; - if (path->data[len - 1] == '/') { + len = hacf->path.len; + if (hacf->path.data[len - 1] == '/') { len--; } - if (len + 1 + ctx->name.len + 1 > sizeof(zpath)) { - ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "hls: too long path"); - return NGX_ERROR; - } - - ngx_snprintf(zpath, sizeof(zpath) - 1, "%*s/%V%Z", len, path->data, - &ctx->name); + *ngx_snprintf(path, sizeof(path) - 1, "%*s/%V", len, hacf->path.data, + &ctx->name) = 0; - if (ngx_file_info(zpath, &fi) != NGX_FILE_ERROR) { + if (ngx_file_info(path, &fi) != NGX_FILE_ERROR) { if (ngx_is_dir(&fi)) { ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, - "hls: directory '%s' exists", zpath); + "hls: directory '%s' exists", path); return NGX_OK; } ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "hls: '%s' exists and is not a directory", zpath); + "hls: '%s' exists and is not a directory", path); return NGX_ERROR; } if (ngx_errno != NGX_ENOENT) { ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno, - "hls: " ngx_file_info_n " failed on '%s'", zpath); + "hls: " ngx_file_info_n " failed on '%s'", path); return NGX_ERROR; } /* NGX_ENOENT */ - if (ngx_create_dir(zpath, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) { + if (ngx_create_dir(path, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno, - "hls: " ngx_create_dir_n " failed on '%s'", zpath); + "hls: " ngx_create_dir_n " failed on '%s'", path); return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, - "hls: directory '%s' created", zpath); + "hls: directory '%s' created", path); return NGX_OK; } @@ -1435,40 +1236,18 @@ *p = 0; - /* key path */ - - if (hacf->keys) { - len = hacf->key_path.len + 1 + ctx->name.len + 1 + NGX_INT64_LEN - + sizeof(".key"); - - ctx->keyfile.data = ngx_palloc(s->connection->pool, len); - if (ctx->keyfile.data == NULL) { - return NGX_ERROR; - } - - p = ngx_cpymem(ctx->keyfile.data, hacf->key_path.data, - hacf->key_path.len); - - if (p[-1] != '/') { - *p++ = '/'; - } - - p = ngx_cpymem(p, ctx->name.data, ctx->name.len); - *p++ = (hacf->nested ? '/' : '-'); - - ctx->keyfile.len = p - ctx->keyfile.data; - } - - ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, - "hls: playlist='%V' playlist_bak='%V' " - "stream_pattern='%V' keyfile_pattern='%V'", - &ctx->playlist, &ctx->playlist_bak, - &ctx->stream, &ctx->keyfile); + ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, + "hls: playlist='%V' playlist_bak='%V' stream_pattern='%V'", + &ctx->playlist, &ctx->playlist_bak, &ctx->stream); if (hacf->continuous) { ngx_rtmp_hls_restore_stream(s); } + if (ngx_rtmp_hls_ensure_directory(s) != NGX_OK) { + return NGX_ERROR; + } + next: return next_publish(s, v); } @@ -1566,15 +1345,13 @@ ngx_rtmp_hls_app_conf_t *hacf; ngx_rtmp_hls_frag_t *f; ngx_msec_t ts_frag_len; - ngx_int_t same_frag, force,discont; + ngx_int_t same_frag; ngx_buf_t *b; int64_t d; hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module); ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module); f = NULL; - force = 0; - discont = 1; if (ctx->opened) { f = ngx_rtmp_hls_get_frag(s, ctx->nfrags); @@ -1582,12 +1359,12 @@ if (d > (int64_t) hacf->max_fraglen * 90 || d < -90000) { ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "hls: force fragment split: %.3f sec, ", d / 90000.); - force = 1; + "hls: max fragment length reached: %.3f sec, ", + f->duration); + boundary = 1; } else { f->duration = (ts - ctx->frag_ts) / 90000.; - discont = 0; } } @@ -1615,9 +1392,9 @@ break; } - if (boundary || force) { + if (boundary) { ngx_rtmp_hls_close_fragment(s); - ngx_rtmp_hls_open_fragment(s, ts, discont); + ngx_rtmp_hls_open_fragment(s, ts, !f); } b = ctx->aframe; @@ -1640,7 +1417,7 @@ ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module); - if (ctx == NULL || !ctx->opened) { + if (!ctx->opened) { return NGX_OK; } @@ -2176,13 +1953,6 @@ { max_age = playlen / 1000; - } else if (name.len >= 4 && name.data[name.len - 4] == '.' && - name.data[name.len - 3] == 'k' && - name.data[name.len - 2] == 'e' && - name.data[name.len - 1] == 'y') - { - max_age = playlen / 500; - } else { ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0, "hls: cleanup skip unknown file type '%V'", &name); @@ -2210,22 +1980,14 @@ } -#if (nginx_version >= 1011005) -static ngx_msec_t -#else static time_t -#endif ngx_rtmp_hls_cleanup(void *data) { ngx_rtmp_hls_cleanup_t *cleanup = data; ngx_rtmp_hls_cleanup_dir(&cleanup->path, cleanup->playlen); -#if (nginx_version >= 1011005) - return cleanup->playlen * 2; -#else return cleanup->playlen / 500; -#endif } @@ -2305,9 +2067,6 @@ conf->max_audio_delay = NGX_CONF_UNSET_MSEC; conf->audio_buffer_size = NGX_CONF_UNSET_SIZE; conf->cleanup = NGX_CONF_UNSET; - conf->granularity = NGX_CONF_UNSET; - conf->keys = NGX_CONF_UNSET; - conf->frags_per_key = NGX_CONF_UNSET_UINT; return conf; } @@ -2341,11 +2100,6 @@ NGX_RTMP_HLS_BUFSIZE); ngx_conf_merge_value(conf->cleanup, prev->cleanup, 1); ngx_conf_merge_str_value(conf->base_url, prev->base_url, ""); - ngx_conf_merge_value(conf->granularity, prev->granularity, 0); - ngx_conf_merge_value(conf->keys, prev->keys, 0); - ngx_conf_merge_str_value(conf->key_path, prev->key_path, ""); - ngx_conf_merge_str_value(conf->key_url, prev->key_url, ""); - ngx_conf_merge_uint_value(conf->frags_per_key, prev->frags_per_key, 0); if (conf->fraglen) { conf->winfrags = conf->playlen / conf->fraglen; @@ -2386,44 +2140,6 @@ ngx_conf_merge_str_value(conf->path, prev->path, ""); - if (conf->keys && conf->cleanup && conf->key_path.len && - ngx_strcmp(conf->key_path.data, conf->path.data) != 0 && - conf->type != NGX_RTMP_HLS_TYPE_EVENT) - { - if (conf->key_path.data[conf->key_path.len - 1] == '/') { - conf->key_path.len--; - } - - cleanup = ngx_pcalloc(cf->pool, sizeof(*cleanup)); - if (cleanup == NULL) { - return NGX_CONF_ERROR; - } - - cleanup->path = conf->key_path; - cleanup->playlen = conf->playlen; - - conf->slot = ngx_pcalloc(cf->pool, sizeof(*conf->slot)); - if (conf->slot == NULL) { - return NGX_CONF_ERROR; - } - - conf->slot->manager = ngx_rtmp_hls_cleanup; - conf->slot->name = conf->key_path; - conf->slot->data = cleanup; - conf->slot->conf_file = cf->conf_file->file.name.data; - conf->slot->line = cf->conf_file->line; - - if (ngx_add_path(cf, &conf->slot) != NGX_OK) { - return NGX_CONF_ERROR; - } - } - - ngx_conf_merge_str_value(conf->key_path, prev->key_path, ""); - - if (conf->key_path.len == 0) { - conf->key_path = conf->path; - } - return NGX_CONF_OK; }

@@ -75,90 +75,15 @@ #define NGX_RTMP_HLS_DELAY 63000 -static ngx_int_t -ngx_rtmp_mpegts_write_file(ngx_rtmp_mpegts_file_t *file, u_char *in, - size_t in_size) +ngx_int_t +ngx_rtmp_mpegts_write_header(ngx_file_t *file) { - u_char *out; - size_t out_size, n; - ssize_t rc; - - static u_char buf[1024]; - - if (!file->encrypt) { - ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0, - "mpegts: write %uz bytes", in_size); - - rc = ngx_write_fd(file->fd, in, in_size); - if (rc < 0) { - return NGX_ERROR; - } - - return NGX_OK; - } - - /* encrypt */ - - ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0, - "mpegts: write %uz encrypted bytes", in_size); + ssize_t rc; - out = buf; - out_size = sizeof(buf); - - if (file->size > 0 && file->size + in_size >= 16) { - ngx_memcpy(file->buf + file->size, in, 16 - file->size); - - in += 16 - file->size; - in_size -= 16 - file->size; - - AES_cbc_encrypt(file->buf, out, 16, &file->key, file->iv, AES_ENCRYPT); - - out += 16; - out_size -= 16; - - file->size = 0; - } - - for ( ;; ) { - n = in_size & ~0x0f; - - if (n > 0) { - if (n > out_size) { - n = out_size; - } + rc = ngx_write_file(file, ngx_rtmp_mpegts_header, + sizeof(ngx_rtmp_mpegts_header), 0); - AES_cbc_encrypt(in, out, n, &file->key, file->iv, AES_ENCRYPT); - - in += n; - in_size -= n; - - } else if (out == buf) { - break; - } - - rc = ngx_write_fd(file->fd, buf, out - buf + n); - if (rc < 0) { - return NGX_ERROR; - } - - out = buf; - out_size = sizeof(buf); - } - - if (in_size) { - ngx_memcpy(file->buf + file->size, in, in_size); - file->size += in_size; - } - - return NGX_OK; -} - - -static ngx_int_t -ngx_rtmp_mpegts_write_header(ngx_rtmp_mpegts_file_t *file) -{ - return ngx_rtmp_mpegts_write_file(file, ngx_rtmp_mpegts_header, - sizeof(ngx_rtmp_mpegts_header)); + return rc > 0 ? NGX_OK : rc; } @@ -197,14 +122,14 @@ ngx_int_t -ngx_rtmp_mpegts_write_frame(ngx_rtmp_mpegts_file_t *file, - ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b) +ngx_rtmp_mpegts_write_frame(ngx_file_t *file, ngx_rtmp_mpegts_frame_t *f, + ngx_buf_t *b) { ngx_uint_t pes_size, header_size, body_size, in_size, stuff_size, flags; u_char packet[188], *p, *base; ngx_int_t first, rc; - ngx_log_debug6(NGX_LOG_DEBUG_CORE, file->log, 0, + ngx_log_debug6(NGX_LOG_DEBUG_HTTP, file->log, 0, "mpegts: pid=%ui, sid=%ui, pts=%uL, " "dts=%uL, key=%ui, size=%ui", f->pid, f->sid, f->pts, f->dts, @@ -313,87 +238,11 @@ b->pos = b->last; } - rc = ngx_rtmp_mpegts_write_file(file, packet, sizeof(packet)); - if (rc != NGX_OK) { - return rc; - } - } - - return NGX_OK; -} - - -ngx_int_t -ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file, - u_char *key, size_t key_len, uint64_t iv) -{ - if (AES_set_encrypt_key(key, key_len * 8, &file->key)) { - return NGX_ERROR; - } - - ngx_memzero(file->iv, 8); - - file->iv[8] = (u_char) (iv >> 56); - file->iv[9] = (u_char) (iv >> 48); - file->iv[10] = (u_char) (iv >> 40); - file->iv[11] = (u_char) (iv >> 32); - file->iv[12] = (u_char) (iv >> 24); - file->iv[13] = (u_char) (iv >> 16); - file->iv[14] = (u_char) (iv >> 8); - file->iv[15] = (u_char) (iv); - - file->encrypt = 1; - - return NGX_OK; -} - - -ngx_int_t -ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path, - ngx_log_t *log) -{ - file->log = log; - - file->fd = ngx_open_file(path, NGX_FILE_WRONLY, NGX_FILE_TRUNCATE, - NGX_FILE_DEFAULT_ACCESS); - - if (file->fd == NGX_INVALID_FILE) { - ngx_log_error(NGX_LOG_ERR, log, ngx_errno, - "hls: error creating fragment file"); - return NGX_ERROR; - } - - file->size = 0; - - if (ngx_rtmp_mpegts_write_header(file) != NGX_OK) { - ngx_log_error(NGX_LOG_ERR, log, ngx_errno, - "hls: error writing fragment header"); - ngx_close_file(file->fd); - return NGX_ERROR; - } - - return NGX_OK; -} - - -ngx_int_t -ngx_rtmp_mpegts_close_file(ngx_rtmp_mpegts_file_t *file) -{ - u_char buf[16]; - ssize_t rc; - - if (file->encrypt) { - ngx_memset(file->buf + file->size, 16 - file->size, 16 - file->size); - - AES_cbc_encrypt(file->buf, buf, 16, &file->key, file->iv, AES_ENCRYPT); - - rc = ngx_write_fd(file->fd, buf, 16); + rc = ngx_write_file(file, packet, sizeof(packet), file->offset); if (rc < 0) { - return NGX_ERROR; + return rc; } } - ngx_close_file(file->fd); - return NGX_OK; }

@@ -10,18 +10,6 @@ #include <ngx_config.h> #include <ngx_core.h> -#include <openssl/aes.h> - - -typedef struct { - ngx_fd_t fd; - ngx_log_t *log; - unsigned encrypt:1; - unsigned size:4; - u_char buf[16]; - u_char iv[16]; - AES_KEY key; -} ngx_rtmp_mpegts_file_t; typedef struct { @@ -34,13 +22,9 @@ } ngx_rtmp_mpegts_frame_t; -ngx_int_t ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file, - u_char *key, size_t key_len, uint64_t iv); -ngx_int_t ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path, - ngx_log_t *log); -ngx_int_t ngx_rtmp_mpegts_close_file(ngx_rtmp_mpegts_file_t *file); -ngx_int_t ngx_rtmp_mpegts_write_frame(ngx_rtmp_mpegts_file_t *file, - ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b); +ngx_int_t ngx_rtmp_mpegts_write_header(ngx_file_t *file); +ngx_int_t ngx_rtmp_mpegts_write_frame(ngx_file_t *file, + ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b); #endif /* _NGX_RTMP_MPEGTS_H_INCLUDED_ */

@@ -29,16 +29,9 @@ static char * ngx_rtmp_merge_applications(ngx_conf_t *cf, ngx_array_t *applications, void **app_conf, ngx_rtmp_module_t *module, ngx_uint_t ctx_index); -static ngx_int_t ngx_rtmp_init_process(ngx_cycle_t *cycle); -#if (nginx_version >= 1007011) -ngx_queue_t ngx_rtmp_init_queue; -#elif (nginx_version >= 1007005) -ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; -#else ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue; -#endif ngx_uint_t ngx_rtmp_max_module; @@ -71,7 +64,7 @@ NGX_CORE_MODULE, /* module type */ NULL, /* init master */ NULL, /* init module */ - ngx_rtmp_init_process, /* init process */ + NULL, /* init process */ NULL, /* init thread */ NULL, /* exit thread */ NULL, /* exit process */ @@ -87,7 +80,6 @@ ngx_uint_t i, m, mi, s; ngx_conf_t pcf; ngx_array_t ports; - ngx_module_t **modules; ngx_rtmp_listen_t *listen; ngx_rtmp_module_t *module; ngx_rtmp_conf_ctx_t *ctx; @@ -103,12 +95,6 @@ /* count the number of the rtmp modules and set up their indices */ -#if (nginx_version >= 1009011) - - ngx_rtmp_max_module = ngx_count_modules(cf->cycle, NGX_RTMP_MODULE); - -#else - ngx_rtmp_max_module = 0; for (m = 0; ngx_modules[m]; m++) { if (ngx_modules[m]->type != NGX_RTMP_MODULE) { @@ -118,8 +104,6 @@ ngx_modules[m]->ctx_index = ngx_rtmp_max_module++; } -#endif - /* the rtmp main_conf context, it is the same in the all rtmp contexts */ @@ -157,19 +141,13 @@ * of the all rtmp modules */ -#if (nginx_version >= 1009011) - modules = cf->cycle->modules; -#else - modules = ngx_modules; -#endif - - for (m = 0; modules[m]; m++) { - if (modules[m]->type != NGX_RTMP_MODULE) { + for (m = 0; ngx_modules[m]; m++) { + if (ngx_modules[m]->type != NGX_RTMP_MODULE) { continue; } - module = modules[m]->ctx; - mi = modules[m]->ctx_index; + module = ngx_modules[m]->ctx; + mi = ngx_modules[m]->ctx_index; if (module->create_main_conf) { ctx->main_conf[mi] = module->create_main_conf(cf); @@ -196,12 +174,12 @@ pcf = *cf; cf->ctx = ctx; - for (m = 0; modules[m]; m++) { - if (modules[m]->type != NGX_RTMP_MODULE) { + for (m = 0; ngx_modules[m]; m++) { + if (ngx_modules[m]->type != NGX_RTMP_MODULE) { continue; } - module = modules[m]->ctx; + module = ngx_modules[m]->ctx; if (module->preconfiguration) { if (module->preconfiguration(cf) != NGX_OK) { @@ -227,13 +205,13 @@ cmcf = ctx->main_conf[ngx_rtmp_core_module.ctx_index]; cscfp = cmcf->servers.elts; - for (m = 0; modules[m]; m++) { - if (modules[m]->type != NGX_RTMP_MODULE) { + for (m = 0; ngx_modules[m]; m++) { + if (ngx_modules[m]->type != NGX_RTMP_MODULE) { continue; } - module = modules[m]->ctx; - mi = modules[m]->ctx_index; + module = ngx_modules[m]->ctx; + mi = ngx_modules[m]->ctx_index; /* init rtmp{} main_conf's */ @@ -298,12 +276,12 @@ return NGX_CONF_ERROR; } - for (m = 0; modules[m]; m++) { - if (modules[m]->type != NGX_RTMP_MODULE) { + for (m = 0; ngx_modules[m]; m++) { + if (ngx_modules[m]->type != NGX_RTMP_MODULE) { continue; } - module = modules[m]->ctx; + module = ngx_modules[m]->ctx; if (module->postconfiguration) { if (module->postconfiguration(cf) != NGX_OK) { @@ -566,7 +544,6 @@ addr->bind = listen->bind; addr->wildcard = listen->wildcard; addr->so_keepalive = listen->so_keepalive; - addr->proxy_protocol = listen->proxy_protocol; #if (NGX_HAVE_KEEPALIVE_TUNABLE) addr->tcp_keepidle = listen->tcp_keepidle; addr->tcp_keepintvl = listen->tcp_keepintvl; @@ -725,7 +702,6 @@ addrs[i].conf.addr_text.len = len; addrs[i].conf.addr_text.data = p; - addrs[i].conf.proxy_protocol = addr->proxy_protocol; } return NGX_OK; @@ -775,7 +751,6 @@ addrs6[i].conf.addr_text.len = len; addrs6[i].conf.addr_text.data = p; - addrs6[i].conf.proxy_protocol = addr->proxy_protocol; } return NGX_OK; @@ -849,13 +824,3 @@ return dst; } - - -static ngx_int_t -ngx_rtmp_init_process(ngx_cycle_t *cycle) -{ -#if (nginx_version >= 1007005) - ngx_queue_init(&ngx_rtmp_init_queue); -#endif - return NGX_OK; -}

@@ -12,7 +12,6 @@ #include <ngx_core.h> #include <ngx_event.h> #include <ngx_event_connect.h> -#include <nginx.h> #include "ngx_rtmp_amf.h" #include "ngx_rtmp_bandwidth.h" @@ -44,7 +43,6 @@ unsigned ipv6only:2; #endif unsigned so_keepalive:2; - unsigned proxy_protocol:1; #if (NGX_HAVE_KEEPALIVE_TUNABLE) int tcp_keepidle; int tcp_keepintvl; @@ -56,7 +54,6 @@ typedef struct { ngx_rtmp_conf_ctx_t *ctx; ngx_str_t addr_text; - unsigned proxy_protocol:1; } ngx_rtmp_addr_conf_t; typedef struct { @@ -100,7 +97,6 @@ unsigned ipv6only:2; #endif unsigned so_keepalive:2; - unsigned proxy_protocol:1; #if (NGX_HAVE_KEEPALIVE_TUNABLE) int tcp_keepidle; int tcp_keepintvl; @@ -199,11 +195,7 @@ ngx_str_t *addr_text; int connected; -#if (nginx_version >= 1007005) - ngx_queue_t posted_dry_events; -#else ngx_event_t *posted_dry_events; -#endif /* client buffer time in msec */ uint32_t buflen; @@ -326,7 +318,6 @@ ngx_flag_t busy; size_t out_queue; size_t out_cork; - ngx_msec_t buflen; ngx_rtmp_conf_ctx_t *ctx; } ngx_rtmp_core_srv_conf_t; @@ -607,13 +598,7 @@ extern ngx_uint_t ngx_rtmp_naccepted; -#if (nginx_version >= 1007011) -extern ngx_queue_t ngx_rtmp_init_queue; -#elif (nginx_version >= 1007005) -extern ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; -#else extern ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue; -#endif extern ngx_uint_t ngx_rtmp_max_module; extern ngx_module_t ngx_rtmp_core_module;

@@ -197,15 +197,8 @@ } #endif /* read key */ - switch (ngx_rtmp_amf_get(ctx, buf, 2)) { - case NGX_DONE: - /* Envivio sends unfinalized arrays */ - return NGX_OK; - case NGX_OK: - break; - default: + if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) return NGX_ERROR; - } ngx_rtmp_amf_reverse_copy(&len, buf, 2);

@@ -93,34 +93,6 @@ }; -static ngx_rtmp_module_t ngx_rtmp_auto_push_index_module_ctx = { - NULL, /* preconfiguration */ - NULL, /* postconfiguration */ - NULL, /* create main configuration */ - NULL, /* init main configuration */ - NULL, /* create server configuration */ - NULL, /* merge server configuration */ - NULL, /* create app configuration */ - NULL /* merge app configuration */ -}; - - -ngx_module_t ngx_rtmp_auto_push_index_module = { - NGX_MODULE_V1, - &ngx_rtmp_auto_push_index_module_ctx, /* module context */ - NULL, /* module directives */ - NGX_RTMP_MODULE, /* module type */ - NULL, /* init master */ - NULL, /* init module */ - NULL, /* init process */ - NULL, /* init thread */ - NULL, /* exit thread */ - NULL, /* exit process */ - NULL, /* exit master */ - NGX_MODULE_V1_PADDING -}; - - #define NGX_RTMP_AUTO_PUSH_SOCKNAME "nginx-rtmp" @@ -352,7 +324,7 @@ apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx, ngx_rtmp_auto_push_module); - ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module); + ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_module); if (ctx == NULL) { return; } @@ -489,14 +461,14 @@ goto next; } - ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module); + ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_module); if (ctx == NULL) { ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_auto_push_ctx_t)); if (ctx == NULL) { goto next; } - ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_auto_push_index_module); + ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_auto_push_module); } ngx_memzero(ctx, sizeof(*ctx)); @@ -536,7 +508,7 @@ goto next; } - ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module); + ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_module); if (ctx) { if (ctx->push_evt.timer_set) { ngx_del_timer(&ctx->push_evt); @@ -560,7 +532,7 @@ slot, &rctx->app, &rctx->name); pctx = ngx_rtmp_get_module_ctx(rctx->publish->session, - ngx_rtmp_auto_push_index_module); + ngx_rtmp_auto_push_module); if (pctx == NULL) { goto next; }

@@ -626,12 +626,6 @@ "play2: name='%s' args='%s' start=%i", v.name, v.args, (ngx_int_t) v.start); - /* continue from current timestamp */ - - if (v.start < 0) { - v.start = s->current_time; - } - ngx_memzero(&vc, sizeof(vc)); /* close_stream should be synchronous */

@@ -102,6 +102,37 @@ }; +static ngx_int_t +ngx_rtmp_control_output_error(ngx_http_request_t *r, const char *msg) +{ + size_t len; + ngx_buf_t *b; + ngx_chain_t cl; + + len = ngx_strlen(msg); + + r->headers_out.status = NGX_HTTP_BAD_REQUEST; + r->headers_out.content_length_n = len; + + b = ngx_calloc_buf(r->pool); + if (b == NULL) { + return NGX_ERROR; + } + + ngx_memzero(&cl, sizeof(cl)); + cl.buf = b; + + b->start = b->pos = (u_char *) msg; + b->end = b->last = (u_char *) msg + len; + b->memory = 1; + b->last_buf = 1; + + ngx_http_send_header(r); + + return ngx_http_output_filter(r, &cl); +} + + static const char * ngx_rtmp_control_record_handler(ngx_http_request_t *r, ngx_rtmp_session_t *s) { @@ -153,7 +184,7 @@ { ngx_rtmp_control_ctx_t *ctx; - ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module); + ctx = ngx_http_get_module_ctx(s, ngx_rtmp_control_module); ngx_rtmp_finalize_session(s); @@ -228,7 +259,7 @@ ngx_rtmp_control_walk_session(ngx_http_request_t *r, ngx_rtmp_live_ctx_t *lctx) { - ngx_str_t addr, *paddr, clientid; + ngx_str_t addr, *paddr; ngx_rtmp_session_t *s, **ss; ngx_rtmp_control_ctx_t *ctx; @@ -249,17 +280,6 @@ } } - if (ngx_http_arg(r, (u_char *) "clientid", sizeof("clientid") - 1, - &clientid) - == NGX_OK) - { - if (s->connection->number != - (ngx_uint_t) ngx_atoi(clientid.data, clientid.len)) - { - return NGX_CONF_OK; - } - } - ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module); switch (ctx->filter) { @@ -444,10 +464,6 @@ goto error; } - if (ctx->path.len == 0) { - return NGX_HTTP_NO_CONTENT; - } - /* output record path */ r->headers_out.status = NGX_HTTP_OK; @@ -455,7 +471,7 @@ b = ngx_create_temp_buf(r->pool, ctx->path.len); if (b == NULL) { - goto error; + return NGX_ERROR; } ngx_memzero(&cl, sizeof(cl)); @@ -469,7 +485,7 @@ return ngx_http_output_filter(r, &cl); error: - return NGX_HTTP_INTERNAL_SERVER_ERROR; + return ngx_rtmp_control_output_error(r, msg); } @@ -527,7 +543,7 @@ b = ngx_calloc_buf(r->pool); if (b == NULL) { - goto error; + return NGX_ERROR; } b->start = b->pos = p; @@ -543,7 +559,7 @@ return ngx_http_output_filter(r, &cl); error: - return NGX_HTTP_INTERNAL_SERVER_ERROR; + return ngx_rtmp_control_output_error(r, msg); } @@ -591,7 +607,7 @@ p = ngx_palloc(r->connection->pool, len); if (p == NULL) { - goto error; + return NGX_ERROR; } len = (size_t) (ngx_snprintf(p, len, "%ui", ctx->count) - p); @@ -601,7 +617,7 @@ b = ngx_calloc_buf(r->pool); if (b == NULL) { - goto error; + return NGX_ERROR; } b->start = b->pos = p; @@ -617,7 +633,7 @@ return ngx_http_output_filter(r, &cl); error: - return NGX_HTTP_INTERNAL_SERVER_ERROR; + return ngx_rtmp_control_output_error(r, msg); }

@@ -150,13 +150,6 @@ offsetof(ngx_rtmp_core_srv_conf_t, publish_time_fix), NULL }, - { ngx_string("buflen"), - NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1, - ngx_conf_set_msec_slot, - NGX_RTMP_SRV_CONF_OFFSET, - offsetof(ngx_rtmp_core_srv_conf_t, buflen), - NULL }, - ngx_null_command }; @@ -247,7 +240,6 @@ conf->out_cork = NGX_CONF_UNSET_SIZE; conf->play_time_fix = NGX_CONF_UNSET; conf->publish_time_fix = NGX_CONF_UNSET; - conf->buflen = NGX_CONF_UNSET_MSEC; conf->busy = NGX_CONF_UNSET; return conf; @@ -275,7 +267,6 @@ conf->out_queue / 8); ngx_conf_merge_value(conf->play_time_fix, prev->play_time_fix, 1); ngx_conf_merge_value(conf->publish_time_fix, prev->publish_time_fix, 1); - ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 1000); ngx_conf_merge_value(conf->busy, prev->busy, 0); if (prev->pool == NULL) { @@ -332,7 +323,6 @@ void *mconf; ngx_uint_t m; ngx_conf_t pcf; - ngx_module_t **modules; ngx_rtmp_module_t *module; ngx_rtmp_conf_ctx_t *ctx, *rtmp_ctx; ngx_rtmp_core_srv_conf_t *cscf, **cscfp; @@ -358,18 +348,12 @@ return NGX_CONF_ERROR; } -#if (nginx_version >= 1009011) - modules = cf->cycle->modules; -#else - modules = ngx_modules; -#endif - - for (m = 0; modules[m]; m++) { - if (modules[m]->type != NGX_RTMP_MODULE) { + for (m = 0; ngx_modules[m]; m++) { + if (ngx_modules[m]->type != NGX_RTMP_MODULE) { continue; } - module = modules[m]->ctx; + module = ngx_modules[m]->ctx; if (module->create_srv_conf) { mconf = module->create_srv_conf(cf); @@ -377,7 +361,7 @@ return NGX_CONF_ERROR; } - ctx->srv_conf[modules[m]->ctx_index] = mconf; + ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf; } if (module->create_app_conf) { @@ -386,7 +370,7 @@ return NGX_CONF_ERROR; } - ctx->app_conf[modules[m]->ctx_index] = mconf; + ctx->app_conf[ngx_modules[m]->ctx_index] = mconf; } } @@ -426,7 +410,6 @@ ngx_int_t i; ngx_str_t *value; ngx_conf_t save; - ngx_module_t **modules; ngx_rtmp_module_t *module; ngx_rtmp_conf_ctx_t *ctx, *pctx; ngx_rtmp_core_srv_conf_t *cscf; @@ -446,22 +429,17 @@ return NGX_CONF_ERROR; } -#if (nginx_version >= 1009011) - modules = cf->cycle->modules; -#else - modules = ngx_modules; -#endif - - for (i = 0; modules[i]; i++) { - if (modules[i]->type != NGX_RTMP_MODULE) { + for (i = 0; ngx_modules[i]; i++) { + if (ngx_modules[i]->type != NGX_RTMP_MODULE) { continue; } - module = modules[i]->ctx; + module = ngx_modules[i]->ctx; if (module->create_app_conf) { - ctx->app_conf[modules[i]->ctx_index] = module->create_app_conf(cf); - if (ctx->app_conf[modules[i]->ctx_index] == NULL) { + ctx->app_conf[ngx_modules[i]->ctx_index] = + module->create_app_conf(cf); + if (ctx->app_conf[ngx_modules[i]->ctx_index] == NULL) { return NGX_CONF_ERROR; } } @@ -502,7 +480,6 @@ ngx_str_t *value; ngx_url_t u; ngx_uint_t i, m; - ngx_module_t **modules; struct sockaddr *sa; ngx_rtmp_listen_t *ls; struct sockaddr_in *sin; @@ -559,9 +536,7 @@ break; } - if (ngx_memcmp(ls[i].sockaddr + off, (u_char *) &u.sockaddr + off, len) - != 0) - { + if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) { continue; } @@ -581,20 +556,14 @@ ngx_memzero(ls, sizeof(ngx_rtmp_listen_t)); - ngx_memcpy(ls->sockaddr, (u_char *) &u.sockaddr, u.socklen); + ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen); ls->socklen = u.socklen; ls->wildcard = u.wildcard; ls->ctx = cf->ctx; -#if (nginx_version >= 1009011) - modules = cf->cycle->modules; -#else - modules = ngx_modules; -#endif - - for (m = 0; modules[m]; m++) { - if (modules[m]->type != NGX_RTMP_MODULE) { + for (m = 0; ngx_modules[m]; m++) { + if (ngx_modules[m]->type != NGX_RTMP_MODULE) { continue; } } @@ -741,11 +710,6 @@ #endif } - if (ngx_strcmp(value[i].data, "proxy_protocol") == 0) { - ls->proxy_protocol = 1; - continue; - } - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "the invalid \"%V\" parameter", &value[i]); return NGX_CONF_ERROR;

@@ -47,6 +47,7 @@ #define NGX_RTMP_FLV_BUFFER (1024*1024) +#define NGX_RTMP_FLV_DEFAULT_BUFLEN 1000 #define NGX_RTMP_FLV_BUFLEN_ADDON 1000 #define NGX_RTMP_FLV_TAG_HEADER 11 #define NGX_RTMP_FLV_DATA_OFFSET 13 @@ -530,8 +531,8 @@ return NGX_OK; } - buflen = s->buflen + NGX_RTMP_FLV_BUFLEN_ADDON; - + buflen = (s->buflen ? s->buflen + NGX_RTMP_FLV_BUFLEN_ADDON: + NGX_RTMP_FLV_DEFAULT_BUFLEN); end_timestamp = (ngx_current_msec - ctx->epoch) + ctx->start_timestamp + buflen;

@@ -272,13 +272,6 @@ b->last += n; s->in_bytes += n; - if (s->in_bytes >= 0xf0000000) { - ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0, - "resetting byte counter"); - s->in_bytes = 0; - s->in_last_ack = 0; - } - if (s->ack_size && s->in_bytes - s->in_last_ack >= s->ack_size) { s->in_last_ack = s->in_bytes;

@@ -7,7 +7,6 @@ #include <ngx_config.h> #include <ngx_core.h> #include "ngx_rtmp.h" -#include "ngx_rtmp_proxy_protocol.h" static void ngx_rtmp_close_connection(ngx_connection_t *c); @@ -131,12 +130,7 @@ s->auto_pushed = unix_socket; - if (addr_conf->proxy_protocol) { - ngx_rtmp_proxy_protocol(s); - - } else { - ngx_rtmp_handshake(s); - } + ngx_rtmp_handshake(s); } @@ -197,13 +191,8 @@ return NULL; } -#if (nginx_version >= 1007005) - ngx_queue_init(&s->posted_dry_events); -#endif - s->epoch = ngx_current_msec; s->timeout = cscf->timeout; - s->buflen = cscf->buflen; ngx_rtmp_set_chunk_size(s, NGX_RTMP_DEFAULT_CHUNK_SIZE);

@@ -920,7 +920,7 @@ ngx_rtmp_log_app_conf_t *lacf; ngx_rtmp_log_t *log; ngx_rtmp_log_op_t *op; - ngx_uint_t n, i; + ngx_uint_t n; u_char *line, *p; size_t len; @@ -934,7 +934,7 @@ } log = lacf->logs->elts; - for (i = 0; i < lacf->logs->nelts; ++i, ++log) { + for (n = 0; n < lacf->logs->nelts; ++n, ++log) { if (ngx_time() == log->disk_full_time) { /* FreeBSD full disk protection;

@@ -220,6 +220,7 @@ } +#define NGX_RTMP_MP4_DEFAULT_BUFLEN 1000 #define NGX_RTMP_MP4_BUFLEN_ADDON 1000 @@ -2123,7 +2124,8 @@ return rc; } - buflen = s->buflen + NGX_RTMP_MP4_BUFLEN_ADDON; + buflen = (s->buflen ? s->buflen + NGX_RTMP_MP4_BUFLEN_ADDON: + NGX_RTMP_MP4_DEFAULT_BUFLEN); counter = 0; last_timestamp = 0; @@ -2229,6 +2231,8 @@ } t->header_sent = 1; + + goto next; } ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,

@@ -585,8 +585,7 @@ sizeof("&swfurl=") - 1 + s->swf_url.len * 3 + sizeof("&tcurl=") - 1 + s->tc_url.len * 3 + sizeof("&pageurl=") - 1 + s->page_url.len * 3 + - sizeof("&addr=") - 1 + addr_text->len * 3 + - sizeof("&clientid=") - 1 + NGX_INT_T_LEN + sizeof("&addr=") - 1 + addr_text->len * 3 ); if (b == NULL) { @@ -620,14 +619,10 @@ b->last = (u_char*) ngx_escape_uri(b->last, s->page_url.data, s->page_url.len, NGX_ESCAPE_ARGS); - b->last = ngx_cpymem(b->last, (u_char*) "&addr=", sizeof("&addr=") - 1); + b->last = ngx_cpymem(b->last, (u_char*) "&addr=", sizeof("&addr=") -1); b->last = (u_char*) ngx_escape_uri(b->last, addr_text->data, addr_text->len, NGX_ESCAPE_ARGS); - b->last = ngx_cpymem(b->last, (u_char*) "&clientid=", - sizeof("&clientid=") - 1); - b->last = ngx_sprintf(b->last, "%ui", (ngx_uint_t) s->connection->number); - return cl; }

@@ -390,7 +390,6 @@ sizeof("&tcurl=") - 1 + tc_url_len * 3 + sizeof("&pageurl=") - 1 + page_url_len * 3 + sizeof("&addr=") - 1 + addr_text->len * 3 + - sizeof("&epoch=") - 1 + NGX_INT32_LEN + 1 + args_len ); @@ -429,9 +428,6 @@ b->last = (u_char*) ngx_escape_uri(b->last, addr_text->data, addr_text->len, NGX_ESCAPE_ARGS); - b->last = ngx_cpymem(b->last, (u_char*) "&epoch=", sizeof("&epoch=") -1); - b->last = ngx_sprintf(b->last, "%uD", (uint32_t) s->epoch); - b->last = ngx_cpymem(b->last, (u_char*) "&call=connect", sizeof("&call=connect") - 1);

@@ -6,7 +6,6 @@ #include <ngx_config.h> #include <ngx_core.h> -#include <nginx.h> #include "ngx_rtmp_play_module.h" #include "ngx_rtmp_cmd_module.h" #include "ngx_rtmp_netcall_module.h" @@ -431,12 +430,7 @@ ngx_del_timer(&ctx->send_evt); } -#if (nginx_version >= 1007005) - if (ctx->send_evt.posted) -#else - if (ctx->send_evt.prev) -#endif - { + if (ctx->send_evt.prev) { ngx_delete_posted_event((&ctx->send_evt)); } @@ -867,7 +861,7 @@ NGX_FILE_DEFAULT_ACCESS); if (ctx->file.fd == NGX_INVALID_FILE) { - ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, ngx_errno, + ngx_log_debug1(NGX_LOG_ERR, s->connection->log, ngx_errno, "play: error opening file '%s'", path); continue; } @@ -921,10 +915,6 @@ ngx_rtmp_send_recorded(s, 1); - if (ngx_rtmp_send_sample_access(s) != NGX_OK) { - return NGX_ERROR; - } - if (ngx_rtmp_play_do_init(s) != NGX_OK) { return NGX_ERROR; }

@@ -790,7 +790,6 @@ void **app_conf; ngx_int_t rc; ngx_rtmp_record_done_t v; - u_char av; rracf = rctx->conf; @@ -798,23 +797,6 @@ return NGX_AGAIN; } - if (rctx->initialized) { - av = 0; - - if (rctx->video) { - av |= 0x01; - } - - if (rctx->audio) { - av |= 0x04; - } - - if (ngx_write_file(&rctx->file, &av, 1, 4) == NGX_ERROR) { - ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno, - "record: %V error writing av mask", &rracf->id); - } - } - if (ngx_close_file(rctx->file.fd) == NGX_FILE_ERROR) { err = ngx_errno; ngx_log_error(NGX_LOG_CRIT, s->connection->log, err, @@ -884,21 +866,8 @@ "record: %V frame: mlen=%uD", &rracf->id, h->mlen); - if (h->type == NGX_RTMP_MSG_VIDEO) { - rctx->video = 1; - } else { - rctx->audio = 1; - } - timestamp = h->timestamp - rctx->epoch; - if ((int32_t) timestamp < 0) { - ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, - "record: %V cut timestamp=%D", &rracf->id, timestamp); - - timestamp = 0; - } - /* write tag header */ ph = hdr; @@ -1089,7 +1058,7 @@ if (!rctx->initialized) { rctx->initialized = 1; - rctx->epoch = h->timestamp - rctx->time_shift; + rctx->epoch = h->timestamp + rctx->time_shift; if (rctx->file.offset == 0 && ngx_rtmp_record_write_header(&rctx->file) != NGX_OK) @@ -1195,7 +1164,6 @@ ngx_int_t i; ngx_str_t *value; ngx_conf_t save; - ngx_module_t **modules; ngx_rtmp_module_t *module; ngx_rtmp_core_app_conf_t *cacf, **pcacf, *rcacf; ngx_rtmp_record_app_conf_t *racf, **pracf, *rracf; @@ -1222,22 +1190,17 @@ return NGX_CONF_ERROR; } -#if (nginx_version >= 1009011) - modules = cf->cycle->modules; -#else - modules = ngx_modules; -#endif - - for (i = 0; modules[i]; i++) { - if (modules[i]->type != NGX_RTMP_MODULE) { + for (i = 0; ngx_modules[i]; i++) { + if (ngx_modules[i]->type != NGX_RTMP_MODULE) { continue; } - module = modules[i]->ctx; + module = ngx_modules[i]->ctx; if (module->create_app_conf) { - ctx->app_conf[modules[i]->ctx_index] = module->create_app_conf(cf); - if (ctx->app_conf[modules[i]->ctx_index] == NULL) { + ctx->app_conf[ngx_modules[i]->ctx_index] = + module->create_app_conf(cf); + if (ctx->app_conf[ngx_modules[i]->ctx_index] == NULL) { return NGX_CONF_ERROR; } }

@@ -51,8 +51,6 @@ unsigned aac_header_sent:1; unsigned avc_header_sent:1; unsigned video_key_sent:1; - unsigned audio:1; - unsigned video:1; } ngx_rtmp_record_rec_ctx_t;

@@ -1335,6 +1335,7 @@ if (s->static_relay) { ngx_add_timer(ctx->static_evt, racf->pull_reconnect); + return; } if (ctx->publish == NULL) {

@@ -8,8 +8,8 @@ #define _NGX_RTMP_VERSION_H_INCLUDED_ -#define nginx_rtmp_version 1001004 -#define NGINX_RTMP_VERSION "1.1.4" +#define nginx_rtmp_version 1001001 +#define NGINX_RTMP_VERSION "1.1.1" #endif /* _NGX_RTMP_VERSION_H_INCLUDED_ */

@@ -0,0 +1,277 @@ +#!/bin/sh +# +# Copyright (C) 1995--2007 Marcus Rückert, SUSE / Novell Inc. +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or (at +# your option) any later version. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, +# USA. +# +# /etc/init.d/nginx +# and its symbolic link +# /(usr/)sbin/rcnginx +# +# Template system startup script for some example service/daemon nginx +# +# LSB compatible service control script; see http://www.linuxbase.org/spec/ +# +# Note: This template uses functions rc_XXX defined in /etc/rc.status on +# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your +# script on this template and ensure that it works on non UL based LSB +# compliant Linux distributions, you either have to provide the rc.status +# functions from UL or change the script to work without them. +# See skeleton.compat for a template that works with other distros as well. +# +### BEGIN INIT INFO +# Provides: nginx +# Required-Start: $syslog $remote_fs +# Should-Start: $time ypbind sendmail +# Required-Stop: $syslog $remote_fs +# Should-Stop: $time ypbind sendmail +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: nginx +# Description: nginx +### END INIT INFO +# +# Any extensions to the keywords given above should be preceeded by +# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. +# +# Notes on Required-Start/Should-Start: +# * There are two different issues that are solved by Required-Start +# and Should-Start +# (a) Hard dependencies: This is used by the runlevel editor to determine +# which services absolutely need to be started to make the start of +# this service make sense. Example: nfsserver should have +# Required-Start: $portmap +# Also, required services are started before the dependent ones. +# The runlevel editor will warn about such missing hard dependencies +# and suggest enabling. During system startup, you may expect an error, +# if the dependency is not fulfilled. +# (b) Specifying the init script ordering, not real (hard) dependencies. +# This is needed by insserv to determine which service should be +# started first (and at a later stage what services can be started +# in parallel). The tag Should-Start: is used for this. +# It tells, that if a service is available, it should be started +# before. If not, never mind. +# * When specifying hard dependencies or ordering requirements, you can +# use names of services (contents of their Provides: section) +# or pseudo names starting with a $. The following ones are available +# according to LSB (1.1): +# $local_fs all local file systems are mounted +# (most services should need this!) +# $remote_fs all remote file systems are mounted +# (note that /usr may be remote, so +# many services should Require this!) +# $syslog system logging facility up +# $network low level networking (eth card, ...) +# $named hostname resolution available +# $netdaemons all network daemons are running +# The $netdaemons pseudo service has been removed in LSB 1.2. +# For now, we still offer it for backward compatibility. +# These are new (LSB 1.2): +# $time the system time has been set correctly +# $portmap SunRPC portmapping service available +# UnitedLinux extensions: +# $ALL indicates that a script should be inserted +# at the end +# * The services specified in the stop tags +# (Required-Stop/Should-Stop) +# specify which services need to be still running when this service +# is shut down. Often the entries there are just copies or a subset +# from the respective start tag. +# * Should-Start/Stop are now part of LSB as of 2.0, +# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. +# insserv does support both variants. +# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time +# (%fillup_and_insserv macro in %post of many RPMs) to specify whether +# a startup script should default to be enabled after installation. +# It's not used by insserv. +# +# Note on runlevels: +# 0 - halt/poweroff 6 - reboot +# 1 - single user 2 - multiuser without network exported +# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) +# +# Note on script names: +# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html +# A registry has been set up to manage the init script namespace. +# http://www.lanana.org/ +# Please use the names already registered or register one or use a +# vendor prefix. + + +# Check for missing binaries (stale symlinks should not happen) +# Note: Special treatment of stop for LSB conformance +NGINX_BIN=/usr/sbin/nginx +test -x $NGINX_BIN || { echo "$NGINX_BIN not installed"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } + +# Check for existence of needed config file and read it +#NGINX_CONFIG=/etc/sysconfig/nginx +#test -r $NGINX_CONFIG || { echo "$NGINX_CONFIG not existing"; +# if [ "$1" = "stop" ]; then exit 0; +# else exit 6; fi; } +# +# Read config +#. $NGINX_CONFIG + +# Source LSB init functions +# providing start_daemon, killproc, pidofproc, +# log_success_msg, log_failure_msg and log_warning_msg. +# This is currently not used by UnitedLinux based distributions and +# not needed for init scripts for UnitedLinux only. If it is used, +# the functions from rc.status should not be sourced or used. +#. /lib/lsb/init-functions + +# Shell functions sourced from /etc/rc.status: +# rc_check check and set local and overall rc status +# rc_status check and set local and overall rc status +# rc_status -v be verbose in local rc status and clear it afterwards +# rc_status -v -r ditto and clear both the local and overall rc status +# rc_status -s display "skipped" and exit with status 3 +# rc_status -u display "unused" and exit with status 3 +# rc_failed set local and overall rc status to failed +# rc_failed <num> set local and overall rc status to <num> +# rc_reset clear both the local and overall rc status +# rc_exit exit appropriate to overall rc status +# rc_active checks whether a service is activated by symlinks +. /etc/rc.status + +# Reset status of this service +rc_reset + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - user had insufficient privileges +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signaling is not supported) are +# considered a success. + +case "$1" in + start) + echo -n "Starting nginx " + ## Start daemon with startproc(8). If this fails + ## the return value is set appropriately by startproc. + /sbin/startproc $NGINX_BIN + + # Remember status and be verbose + rc_status -v + ;; + stop) + echo -n "Shutting down nginx " + ## Stop daemon with killproc(8) and if this fails + ## killproc sets the return value according to LSB. + + /sbin/killproc -TERM $NGINX_BIN + + # Remember status and be verbose + rc_status -v + ;; + try-restart|condrestart) + ## Do a restart only if the service was active before. + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then

-(directory)

@@ -1 +0,0 @@ -ref: refs/heads/master

@@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = https://github.com/yaoweibin/nginx_upstream_check_module.git -[branch "master"] - remote = origin - merge = refs/heads/master