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,

@@ -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,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

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

@@ -67,7 +67,7 @@ 050a4e7586552003baff9dd920d28d51eaf8ab22 refs/remotes/origin/idle-streams 3fc1598db94b234b2ec5f368c34c5d3e877040a0 refs/remotes/origin/init_queue d9d749af5b156ea2b4623f7e8d0efa5139885924 refs/remotes/origin/interleave -5150993accb5edefa61d71e1c81ad8c02f515428 refs/remotes/origin/master +e1f92b1409d1db34c81d8aec1156b6cc71c2ca26 refs/remotes/origin/master 67443c28b4aff60023ce143475c2d287c264f2f7 refs/remotes/origin/meta-copy 266e206afcda93cf2880e660fb796eb99fb6df6c refs/remotes/origin/mixed-codecs 58491f8feddbe801557704dd1d1ac9d0950cdf3f refs/remotes/origin/mp4 @@ -132,7 +132,6 @@ 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 @@ -349,8 +348,6 @@ ^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 @@ -359,11 +356,3 @@ ^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

@@ -1 +1 @@ -5150993accb5edefa61d71e1c81ad8c02f515428 +e1f92b1409d1db34c81d8aec1156b6cc71c2ca26

@@ -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 \ @@ -51,7 +50,7 @@ " -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 +70,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 \ @@ -85,49 +86,7 @@ $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

@@ -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 }

@@ -2210,22 +2210,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 }

@@ -29,12 +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) +#if (nginx_version >= 1007005) ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; #else ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue; @@ -71,7 +68,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 +84,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 +99,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 +108,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 +145,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 +178,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 +209,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 +280,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) { @@ -849,13 +831,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; -}

@@ -607,9 +607,7 @@ extern ngx_uint_t ngx_rtmp_naccepted; -#if (nginx_version >= 1007011) -extern ngx_queue_t ngx_rtmp_init_queue; -#elif (nginx_version >= 1007005) +#if (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;

@@ -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; }

@@ -332,7 +332,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 +357,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 +370,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 +379,7 @@ return NGX_CONF_ERROR; } - ctx->app_conf[modules[m]->ctx_index] = mconf; + ctx->app_conf[ngx_modules[m]->ctx_index] = mconf; } } @@ -426,7 +419,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 +438,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 +489,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 +545,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 +565,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; } }

@@ -197,10 +197,6 @@ 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;

@@ -1195,7 +1195,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 +1221,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; } }

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

@@ -1,53 +0,0 @@ -pagespeed off; - - -# Configuring PageSpeed Filters -pagespeed RewriteLevel PassThrough; - -# Needs to exist and be writable by nginx. Use tmpfs for best performance. -pagespeed MemcachedServers "127.0.0.1:11211"; -pagespeed FileCachePath /var/ngx_pagespeed_cache; - -# PageSpeed Admin -pagespeed StatisticsPath /ngx_pagespeed_statistics; -pagespeed GlobalStatisticsPath /ngx_pagespeed_global_statistics; -pagespeed MessagesPath /ngx_pagespeed_message; -pagespeed ConsolePath /pagespeed_console; -pagespeed AdminPath /pagespeed_admin; -pagespeed GlobalAdminPath /pagespeed_global_admin; - -# PageSpeed Cache Purge -pagespeed EnableCachePurge on; -pagespeed PurgeMethod PURGE; - - -# Ensure requests for pagespeed optimized resources go to the pagespeed handler -# and no extraneous headers get set. -location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" { - add_header "" ""; -} - - -# HTTPS Support -# pagespeed FetchHttps enable; - -# PageSpeed Filters -# CSS Minification -# pagespeed EnableFilters combine_css,rewrite_css; - -# JS Minification -# pagespeed EnableFilters combine_javascript,rewrite_javascript; - -# Images Optimization -#pagespeed EnableFilters lazyload_images; -#pagespeed EnableFilters rewrite_images; -#pagespeed EnableFilters convert_jpeg_to_progressive,convert_png_to_jpeg,convert_jpeg_to_webp,convert_to_webp_lossless; - -# Remove comments from HTML -#pagespeed EnableFilters remove_comments; -# Remove WHITESPACE from HTML -#pagespeed EnableFilters collapse_whitespace; - - -# CDN Support -#pagespeed MapRewriteDomain cdn.example.com www.example.com; \ No newline at end of file

[-] [+]	Deleted	nginx.changes
@@ -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 -
[-] [+]	Deleted	2bc1dac6fb3ed263529decb211ec784824132bf4.patch ^
@@ -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,
[-] [+]	Deleted	check_1.7.5+.patch ^
@@ -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)
[-] [+]	Added	nginx_sysguard_1.3.9.patch ^
@@ -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;
[-] [+]	Added	ngx-detect-heartbleed.patch ^
@@ -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
[-] [+]	Deleted	openssl__chacha20_poly1305_draft_and_rfc_ossl102g.patch ^
@@ -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/\ssha512\-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)'\
	Deleted	1.12.34.2-x64.tar.gz ^
[-] [+]	Deleted	_service ^
@@ -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>
	Deleted	_service:download_url:nginx-1.16.1.tar.gz ^
	Deleted	_service:download_url:openssl-1.1.1b.tar.gz ^
[-] [+]	Deleted	blockips.conf ^
@@ -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;
[-] [+]	Deleted	changelog ^
@@ -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
	Deleted	naxsi-git.tar.gz ^
	Changed	nginx-1.7.9.tar.gz ^
	Deleted	nginx-auth-ldap.tar.gz ^
	Added	nginx-http-sysguard.tar.gz ^
	Deleted	nginx-rtmp-module-1.1.15.tar.gz/.git/objects/pack/pack-3912c9200a41c4fbd876afb583ab7ecb4733401b.idx ^
	Deleted	nginx-rtmp-module-1.1.15.tar.gz/.git/objects/pack/pack-3912c9200a41c4fbd876afb583ab7ecb4733401b.pack ^
	Changed	nginx-rtmp-module-1.1.5.tar.gz/.git/index ^
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/.git/logs/HEAD ^
@@ -1 +1 @@ -0000000000000000000000000000000000000000 5150993accb5edefa61d71e1c81ad8c02f515428 U-arrakis\jg <jg@arrakis.(none)> 1481905161 +0100 clone: from https://github.com/arut/nginx-rtmp-module.git +0000000000000000000000000000000000000000 e1f92b1409d1db34c81d8aec1156b6cc71c2ca26 U-arrakis\jg <jg@arrakis.(none)> 1411118744 +0200 clone: from https://github.com/arut/nginx-rtmp-module.git
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/.git/logs/refs/heads/master ^
@@ -1 +1 @@ -0000000000000000000000000000000000000000 5150993accb5edefa61d71e1c81ad8c02f515428 U-arrakis\jg <jg@arrakis.(none)> 1481905161 +0100 clone: from https://github.com/arut/nginx-rtmp-module.git +0000000000000000000000000000000000000000 e1f92b1409d1db34c81d8aec1156b6cc71c2ca26 U-arrakis\jg <jg@arrakis.(none)> 1411118744 +0200 clone: from https://github.com/arut/nginx-rtmp-module.git
	Added	nginx-rtmp-module-1.1.5.tar.gz/.git/objects/pack/pack-bea6ef95b2e4b056b2d025a750b0d92ad352e815.idx ^
	Added	nginx-rtmp-module-1.1.5.tar.gz/.git/objects/pack/pack-bea6ef95b2e4b056b2d025a750b0d92ad352e815.pack ^
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/.git/packed-refs ^
@@ -67,7 +67,7 @@ 050a4e7586552003baff9dd920d28d51eaf8ab22 refs/remotes/origin/idle-streams 3fc1598db94b234b2ec5f368c34c5d3e877040a0 refs/remotes/origin/init_queue d9d749af5b156ea2b4623f7e8d0efa5139885924 refs/remotes/origin/interleave -5150993accb5edefa61d71e1c81ad8c02f515428 refs/remotes/origin/master +e1f92b1409d1db34c81d8aec1156b6cc71c2ca26 refs/remotes/origin/master 67443c28b4aff60023ce143475c2d287c264f2f7 refs/remotes/origin/meta-copy 266e206afcda93cf2880e660fb796eb99fb6df6c refs/remotes/origin/mixed-codecs 58491f8feddbe801557704dd1d1ac9d0950cdf3f refs/remotes/origin/mp4 @@ -132,7 +132,6 @@ 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 @@ -349,8 +348,6 @@ ^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 @@ -359,11 +356,3 @@ ^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
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/.git/refs/heads/master ^
@@ -1 +1 @@ -5150993accb5edefa61d71e1c81ad8c02f515428 +e1f92b1409d1db34c81d8aec1156b6cc71c2ca26
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/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 \ @@ -51,7 +50,7 @@ " -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 +70,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 \ @@ -85,49 +86,7 @@ $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
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/dash/ngx_rtmp_dash_module.c ^
@@ -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 }
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/hls/ngx_rtmp_hls_module.c ^
@@ -2210,22 +2210,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 }
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/ngx_rtmp.c ^
@@ -29,12 +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) +#if (nginx_version >= 1007005) ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; #else ngx_thread_volatile ngx_event_t ngx_rtmp_init_queue; @@ -71,7 +68,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 +84,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 +99,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 +108,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 +145,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 +178,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 +209,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 +280,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) { @@ -849,13 +831,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; -}
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/ngx_rtmp.h ^
@@ -607,9 +607,7 @@ extern ngx_uint_t ngx_rtmp_naccepted; -#if (nginx_version >= 1007011) -extern ngx_queue_t ngx_rtmp_init_queue; -#elif (nginx_version >= 1007005) +#if (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;
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/ngx_rtmp_auto_push_module.c ^
@@ -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; }
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/ngx_rtmp_core_module.c ^
@@ -332,7 +332,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 +357,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 +370,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 +379,7 @@ return NGX_CONF_ERROR; } - ctx->app_conf[modules[m]->ctx_index] = mconf; + ctx->app_conf[ngx_modules[m]->ctx_index] = mconf; } } @@ -426,7 +419,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 +438,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 +489,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 +545,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 +565,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; } }
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/ngx_rtmp_init.c ^
@@ -197,10 +197,6 @@ 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;
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/ngx_rtmp_record_module.c ^
@@ -1195,7 +1195,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 +1221,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; } }
[-] [+]	Changed	nginx-rtmp-module-1.1.5.tar.gz/ngx_rtmp_relay_module.c ^
@@ -1335,6 +1335,7 @@ if (s->static_relay) { ngx_add_timer(ctx->static_evt, racf->pull_reconnect); + return; } if (ctx->publish == NULL) {
	Deleted	ngx_cache_purge-2.3.tar.gz ^
	Deleted	ngx_pagespeed-latest-testing.zip ^
	Deleted	ngx_pagespeed-latest-testing.zip.old ^
	Added	openssl-1.0.1j.tar.gz ^
[-] [+]	Deleted	pagespeed.conf ^
@@ -1,53 +0,0 @@ -pagespeed off; - - -# Configuring PageSpeed Filters -pagespeed RewriteLevel PassThrough; - -# Needs to exist and be writable by nginx. Use tmpfs for best performance. -pagespeed MemcachedServers "127.0.0.1:11211"; -pagespeed FileCachePath /var/ngx_pagespeed_cache; - -# PageSpeed Admin -pagespeed StatisticsPath /ngx_pagespeed_statistics; -pagespeed GlobalStatisticsPath /ngx_pagespeed_global_statistics; -pagespeed MessagesPath /ngx_pagespeed_message; -pagespeed ConsolePath /pagespeed_console; -pagespeed AdminPath /pagespeed_admin; -pagespeed GlobalAdminPath /pagespeed_global_admin; - -# PageSpeed Cache Purge -pagespeed EnableCachePurge on; -pagespeed PurgeMethod PURGE; - - -# Ensure requests for pagespeed optimized resources go to the pagespeed handler -# and no extraneous headers get set. -location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" { - add_header "" ""; -} - - -# HTTPS Support -# pagespeed FetchHttps enable; - -# PageSpeed Filters -# CSS Minification -# pagespeed EnableFilters combine_css,rewrite_css; - -# JS Minification -# pagespeed EnableFilters combine_javascript,rewrite_javascript; - -# Images Optimization -#pagespeed EnableFilters lazyload_images; -#pagespeed EnableFilters rewrite_images; -#pagespeed EnableFilters convert_jpeg_to_progressive,convert_png_to_jpeg,convert_jpeg_to_webp,convert_to_webp_lossless; - -# Remove comments from HTML -#pagespeed EnableFilters remove_comments; -# Remove WHITESPACE from HTML -#pagespeed EnableFilters collapse_whitespace; - - -# CDN Support -#pagespeed MapRewriteDomain cdn.example.com www.example.com; \ No newline at end of file
	Deleted	release-1.11.33.2-beta.zip ^
	Deleted	v1.10.33.6-beta.zip ^

Changes of Revision 10