testing/nginx-naxsi: update to 1.9.12

Changes with nginx 1.9.12                                        24 Feb 2016

    *) Feature: Huffman encoding of response headers in HTTP/2.
       Thanks to Vlad Krasnov.

    *) Feature: the "worker_cpu_affinity" directive now supports more than
       64 CPUs.

    *) Bugfix: compatibility with 3rd party C++ modules; the bug had
       appeared in 1.9.11.
       Thanks to Piotr Sikora.

    *) Bugfix: nginx could not be built statically with OpenSSL on Linux;
       the bug had appeared in 1.9.11.

    *) Bugfix: the "add_header ... always" directive with an empty value did
       not delete "Last-Modified" and "ETag" header lines from error
       responses.

    *) Workaround: "called a function you should not call" and "shutdown
       while in init" messages might appear in logs when using OpenSSL
       1.0.2f.

    *) Bugfix: invalid headers might be logged incorrectly.

    *) Bugfix: socket leak when using HTTP/2.

    *) Bugfix: in the ngx_http_v2_module.

2 files changed, 20 insertions, 20 deletions

diff --git a/testing/nginx-naxsi/APKBUILD b/testing/nginx-naxsi/APKBUILD
index 44f659565cc..da88773c382 100644
--- a/testing/nginx-naxsi/APKBUILD
+++ b/testing/nginx-naxsi/APKBUILD
@@ -5,7 +5,7 @@
 
 pkgname=nginx-naxsi
 _pkgname=nginx
-pkgver=1.9.11
+pkgver=1.9.12
 _ngx_naxsi_ver=0.54
 _ngx_cache_purge_ver=2.3
 _ngx_upstream_fair_ver=0.1.0
@@ -111,32 +111,32 @@ vim() {
         done
 }
 
-md5sums="76eb5853a1190e0cfc691aa21c545de3  nginx-1.9.11.tar.gz
+md5sums="0afe4a7e589a0de43b7b54aa055a4351  nginx-1.9.12.tar.gz
 1bc31058991268e4cfdb44e9b6d8b3b3  naxsi-0.54.tar.gz
 dc4c0688ed03ca7f5563097c2a8a76ca  ngx_cache_purge-2.3.tar.gz
 f3562ef6573f616e254d382d6f86b8e1  upstream-fair-0.1.0.tar.gz
 fdb072dc8d67b573a0ea7983530a7d2b  sysguard-2.1.0.tar.gz
-02d37a07acf510a957392fbe3ac1c990  anonymise.patch
+31d29937da95b31714faa399aeb07407  anonymise.patch
 801a87f7f9d27f8ad85b41a78b4c4461  ipv6.patch
 50357b75049d878c0bcce10d0c60f9ed  sysguard.patch
 609ea97ab6c3c30f9e8329968aadc4f3  nginx.initd
 8823274a834332d3db4f62bf7dd1fb7d  nginx.logrotate"
-sha256sums="6a5c72f4afaf57a6db064bba0965d72335f127481c5d4e64ee8714e7b368a51f  nginx-1.9.11.tar.gz
+sha256sums="1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f5410337da042  nginx-1.9.12.tar.gz
 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5  naxsi-0.54.tar.gz
 cb7d5f22919c613f1f03341a1aeb960965269302e9eb23425ccaabd2f5dcbbec  ngx_cache_purge-2.3.tar.gz
 dd0bfb79d2489f48ea63ac004d91890cd471eb4020500ce9179c3612cb13246c  upstream-fair-0.1.0.tar.gz
 97e0cc9a36fcce375c5b0667b002d2f7acd580e968a2318e3276fbdc1b99f8e4  sysguard-2.1.0.tar.gz
-ab4475a191f6d858d8118e08e8911994d594a37e769f41bd0bb2b255dc124a37  anonymise.patch
+28adf3605875197d5822fa382f5fd3c9c80f7d3a561e904fee223fa051f98810  anonymise.patch
 a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b  ipv6.patch
 18090329435c32d91621a5943acc5b8bbe89aaa3c2fa334c3a4cdeb00efb6226  sysguard.patch
 8cbef405295eac299dfc3b9b119c02bda354a9b335923bed6ff6992c1fd8f493  nginx.initd
 cea0c6f8de55a4c3a3eccc57910de1c3116634082c8e5b660630fb927a29f38d  nginx.logrotate"
-sha512sums="1ea79b8ade066faa4facdb13631b97c3228cc91f512dc98c7b1b153a489936f2bc13017ea67097cd303581720fd9bc3a212744ac0a03a1ea514e56321b407caa  nginx-1.9.11.tar.gz
+sha512sums="b5f4cae48c85cdc9a95006b6a321834de9d18981cb1a25670c9fc948d86b9a8906d25a1ca174626eb418b0afdb3f2e1df3cbb6f5a48bd781e39e2470a4d52520  nginx-1.9.12.tar.gz
 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43  naxsi-0.54.tar.gz
 81929ca57ce5c2e1af6ec43882a54ff1da8dc77786bfb7505ff94fbcf970ae8870b419dc5c0bc7b80794d75a359e0100f360c1cf458a300f802b1d8bd7053811  ngx_cache_purge-2.3.tar.gz
 2ff9894986c5cd483ecee97d8818675ef6d063e5f45bb66e8cf56c78bbd043b9c0c37eb3cf650b7cfb6d40da9f7a4ba0e030fe39de5ef1f715cbcd6560248428  upstream-fair-0.1.0.tar.gz
 f9587b8aa7a2b09be016dc6f7a07fe3fee154d16172194e899bf3c78a3f4e373c78f79932794cd9ac75793514c606ab878f88be9400b70e37528d263f1541b34  sysguard-2.1.0.tar.gz
-36e1cd174d2f288f0f58e2989772ccc1ea9313b6877eb93b647e173c421c06fef6d90743981399dd3f2e42144047797e741cdb1e8e60bf90fb1897c62b125e3b  anonymise.patch
+f8e46dafcf553edd35699dc2a47a54756e0a4c690fc13f81436ad9db1026739ba331ad99d3d05d8a7c089a5c067bf45f4aca3a98fdd9483b7b0123a837e695be  anonymise.patch
 68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f  ipv6.patch
 2dca2ac74fb92e330fde7b6b6120b2fd2565c377a629c9536cf77beebe41aa4b092d4229d5b487b0fb02be4f2cc5b897c429c87bbbbc7b0d31e1cbb94231ddce  sysguard.patch
 6e9a37176c0ca5a463a2745401bc5a6f9c002a236244b615a2803ec04404cc768678a1fa27ee047f81f4ccf002f7bea4b803522049f4ef839c61bb83577b9d65  nginx.initd
diff --git a/testing/nginx-naxsi/anonymise.patch b/testing/nginx-naxsi/anonymise.patch
index a5635787250..17bca99b519 100644
--- a/testing/nginx-naxsi/anonymise.patch
+++ b/testing/nginx-naxsi/anonymise.patch
@@ -41,36 +41,36 @@
  "</body>" CRLF
  "</html>" CRLF
  ;
---- nginx-1.9.11/src/http/v2/ngx_http_v2_filter_module.c
-+++ nginx-1.9.11/src/http/v2/ngx_http_v2_filter_module.c.new
-@@ -214,10 +214,10 @@
+--- nginx-1.9.12/src/http/v2/ngx_http_v2_filter_module.c
++++ nginx-1.9.12/src/http/v2/ngx_http_v2_filter_module.c.new
+@@ -229,9 +229,9 @@
  
      clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
  
 -    if (r->headers_out.server == NULL) {
 +/*  if (r->headers_out.server == NULL) {
-         len += 1 + (clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER)
-                                         : ngx_http_v2_literal_size("nginx"));
+         len += 1 + (clcf->server_tokens ? nginx_ver_len : sizeof(nginx));
 -    }
 +    } */
  
      if (r->headers_out.date == NULL) {
          len += 1 + ngx_http_v2_literal_size("Wed, 31 Dec 1986 18:00:00 GMT");
-@@ -404,7 +404,7 @@
+@@ -434,7 +434,7 @@
          pos = ngx_sprintf(pos, "%03ui", r->headers_out.status);
      }
  
 -    if (r->headers_out.server == NULL) {
 +/*  if (r->headers_out.server == NULL) {
-         *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
- 
-         if (clcf->server_tokens) {
-@@ -415,7 +415,7 @@
-             *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("nginx") - 1);
-             pos = ngx_cpymem(pos, "nginx", sizeof("nginx") - 1);
+         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                        "http2 output header: \"server: %s\"",
+                        clcf->server_tokens ? NGINX_VER : "nginx");
+@@ -453,7 +453,7 @@
+         } else {
+             pos = ngx_cpymem(pos, nginx, sizeof(nginx));
          }
 -    }
 +    } */
  
      if (r->headers_out.date == NULL) {
-         *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX);
+         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+