nginx: upgrade to 1.9.6

nginx_version

@@ -1 +1 @@
-1.9.5
+1.9.6

packages/windows/Rakefile

@@ -42,7 +42,6 @@ mecab_patches = [
   "mecab-0.98-add-missing-dll-export.diff",
 ]
 nginx_patches = [
-  "nginx-1.9-5-fix-build-error.diff",
 ]
 if groonga_win32_x86_p
   host = "i686-w64-mingw32"

vendor/nginx-1.9.5/auto/endianness → vendor/nginx-1.9.6/auto/endianness

@@ -4,8 +4,13 @@
 
 
 echo $ngx_n "checking for system byte ordering ...$ngx_c"
-echo >> $NGX_ERR
-echo "checking for system byte ordering" >> $NGX_ERR
+
+cat << END >> $NGX_AUTOCONF_ERR
+
+----------------------------------------
+checking for system byte ordering
+
+END
 
 
 cat << END > $NGX_AUTOTEST.c

vendor/nginx-1.9.5/auto/types/uintptr_t → vendor/nginx-1.9.6/auto/types/uintptr_t

@@ -4,8 +4,13 @@
 
 
 echo $ngx_n "checking for uintptr_t ...$ngx_c"
-echo >> $NGX_AUTOCONF_ERR
-echo "checking for uintptr_t" >> $NGX_AUTOCONF_ERR
+
+cat << END >> $NGX_AUTOCONF_ERR
+
+----------------------------------------
+checking for uintptr_t
+
+END
 
 found=no
 

vendor/nginx-1.9.5/docs/xml/nginx/changes.xml → vendor/nginx-1.9.6/docs/xml/nginx/changes.xml

@@ -5,6 +5,90 @@
 <change_log title="nginx">
 
 
+<changes ver="1.9.6" date="27.10.2015">
+
+<change type="bugfix">
+<para lang="ru">
+при использовании HTTP/2
+в рабочем процессе мог произойти segmentation fault.<br/>
+Спасибо Piotr Sikora и Denis Andzakovic.
+</para>
+<para lang="en">
+a segmentation fault might occur in a worker process
+when using HTTP/2.<br/>
+Thanks to Piotr Sikora and Denis Andzakovic.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+при использовании HTTP/2 переменная $server_protocol была пустой.
+</para>
+<para lang="en">
+the $server_protocol variable was empty when using HTTP/2.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+SSL-соединения к бэкендам в модуле stream
+могли неожиданно завершаться по таймауту.
+</para>
+<para lang="en">
+backend SSL connections in the stream module
+might be timed out unexpectedly.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+при использовании различных настроек ssl_session_cache
+в разных виртуальных серверах
+в рабочем процессе мог произойти segmentation fault.
+</para>
+<para lang="en">
+a segmentation fault might occur in a worker process
+if different ssl_session_cache settings were used
+in different virtual servers.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+nginx/Windows не собирался с MinGW gcc;
+ошибка появилась в 1.9.4.<br/>
+Спасибо Kouhei Sutou.
+</para>
+<para lang="en">
+nginx/Windows could not be built with MinGW gcc;
+the bug had appeared in 1.9.4.<br/>
+Thanks to Kouhei Sutou.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+при использовании директивы timer_resolution на Windows время не обновлялось.
+</para>
+<para lang="en">
+time was not updated when the timer_resolution directive was used on Windows.
+</para>
+</change>
+
+<change>
+<para lang="ru">
+Незначительные исправления и улучшения.<br/>
+Спасибо Markus Linnala, Kurtis Nusbaum и Piotr Sikora.
+</para>
+<para lang="en">
+Miscellaneous minor fixes and improvements.<br/>
+Thanks to Markus Linnala, Kurtis Nusbaum and Piotr Sikora.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="1.9.5" date="22.09.2015">
 
 <change type="feature">

vendor/nginx-1.9.5/src/core/nginx.c → vendor/nginx-1.9.6/src/core/nginx.c

@@ -10,6 +10,7 @@
 #include <nginx.h>
 
 
+static void ngx_show_version_info();
 static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle);
 static ngx_int_t ngx_get_options(int argc, char *const *argv);
 static ngx_int_t ngx_process_options(ngx_cycle_t *cycle);
@@ -194,64 +195,7 @@ main(int argc, char *const *argv)
     }
 
     if (ngx_show_version) {
-        ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED);
-
-        if (ngx_show_help) {
-            ngx_write_stderr(
-                "Usage: nginx [-?hvVtTq] [-s signal] [-c filename] "
-                             "[-p prefix] [-g directives]" NGX_LINEFEED
-                             NGX_LINEFEED
-                "Options:" NGX_LINEFEED
-                "  -?,-h         : this help" NGX_LINEFEED
-                "  -v            : show version and exit" NGX_LINEFEED
-                "  -V            : show version and configure options then exit"
-                                   NGX_LINEFEED
-                "  -t            : test configuration and exit" NGX_LINEFEED
-                "  -T            : test configuration, dump it and exit"
-                                   NGX_LINEFEED
-                "  -q            : suppress non-error messages "
-                                   "during configuration testing" NGX_LINEFEED
-                "  -s signal     : send signal to a master process: "
-                                   "stop, quit, reopen, reload" NGX_LINEFEED
-#ifdef NGX_PREFIX
-                "  -p prefix     : set prefix path (default: "
-                                   NGX_PREFIX ")" NGX_LINEFEED
-#else
-                "  -p prefix     : set prefix path (default: NONE)" NGX_LINEFEED
-#endif
-                "  -c filename   : set configuration file (default: "
-                                   NGX_CONF_PATH ")" NGX_LINEFEED
-                "  -g directives : set global directives out of configuration "
-                                   "file" NGX_LINEFEED NGX_LINEFEED
-                );
-        }
-
-        if (ngx_show_configure) {
-
-#ifdef NGX_COMPILER
-            ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED);
-#endif
-
-#if (NGX_SSL)
-            if (SSLeay() == SSLEAY_VERSION_NUMBER) {
-                ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
-                                 NGX_LINEFEED);
-            } else {
-                ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
-                                 " (running with ");
-                ngx_write_stderr((char *) (uintptr_t)
-                                 SSLeay_version(SSLEAY_VERSION));
-                ngx_write_stderr(")" NGX_LINEFEED);
-            }
-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-            ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED);
-#else
-            ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED);
-#endif
-#endif
-
-            ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
-        }
+        ngx_show_version_info();
 
         if (!ngx_test_config) {
             return 0;
@@ -419,6 +363,69 @@ main(int argc, char *const *argv)
 }
 
 
+static void
+ngx_show_version_info()
+{
+    ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED);
+
+    if (ngx_show_help) {
+        ngx_write_stderr(
+            "Usage: nginx [-?hvVtTq] [-s signal] [-c filename] "
+                         "[-p prefix] [-g directives]" NGX_LINEFEED
+                         NGX_LINEFEED
+            "Options:" NGX_LINEFEED
+            "  -?,-h         : this help" NGX_LINEFEED
+            "  -v            : show version and exit" NGX_LINEFEED
+            "  -V            : show version and configure options then exit"
+                               NGX_LINEFEED
+            "  -t            : test configuration and exit" NGX_LINEFEED
+            "  -T            : test configuration, dump it and exit"
+                               NGX_LINEFEED
+            "  -q            : suppress non-error messages "
+                               "during configuration testing" NGX_LINEFEED
+            "  -s signal     : send signal to a master process: "
+                               "stop, quit, reopen, reload" NGX_LINEFEED
+#ifdef NGX_PREFIX
+            "  -p prefix     : set prefix path (default: " NGX_PREFIX ")"
+                               NGX_LINEFEED
+#else
+            "  -p prefix     : set prefix path (default: NONE)" NGX_LINEFEED
+#endif
+            "  -c filename   : set configuration file (default: " NGX_CONF_PATH
+                               ")" NGX_LINEFEED
+            "  -g directives : set global directives out of configuration "
+                               "file" NGX_LINEFEED NGX_LINEFEED
+        );
+    }
+
+    if (ngx_show_configure) {
+
+#ifdef NGX_COMPILER
+        ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED);
+#endif
+
+#if (NGX_SSL)
+        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
+            ngx_write_stderr("built with " OPENSSL_VERSION_TEXT NGX_LINEFEED);
+        } else {
+            ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
+                             " (running with ");
+            ngx_write_stderr((char *) (uintptr_t)
+                             SSLeay_version(SSLEAY_VERSION));
+            ngx_write_stderr(")" NGX_LINEFEED);
+        }
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+        ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED);
+#else
+        ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED);
+#endif
+#endif
+
+        ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
+    }
+}
+
+
 static ngx_int_t
 ngx_add_inherited_sockets(ngx_cycle_t *cycle)
 {
@@ -1139,7 +1146,7 @@ ngx_set_user(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_OK;
     }
 
-    value = (ngx_str_t *) cf->args->elts;
+    value = cf->args->elts;
 
     ccf->username = (char *) value[1].data;
 
@@ -1345,7 +1352,7 @@ ngx_set_worker_processes(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return "is duplicate";
     }
 
-    value = (ngx_str_t *) cf->args->elts;
+    value = cf->args->elts;
 
     if (ngx_strcmp(value[1].data, "auto") == 0) {
         ccf->worker_processes = ngx_ncpu;

vendor/nginx-1.9.5/src/core/nginx.h → vendor/nginx-1.9.6/src/core/nginx.h

@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009005
-#define NGINX_VERSION      "1.9.5"
+#define nginx_version      1009006
+#define NGINX_VERSION      "1.9.6"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD

vendor/nginx-1.9.5/src/core/ngx_connection.c → vendor/nginx-1.9.6/src/core/ngx_connection.c

@@ -1175,7 +1175,7 @@ ngx_close_idle_connections(ngx_cycle_t *cycle)
 
         /* THREAD: lock */
 
-        if (c[i].fd != -1 && c[i].idle) {
+        if (c[i].fd != (ngx_socket_t) -1 && c[i].idle) {
             c[i].close = 1;
             c[i].read->handler(c[i].read);
         }

vendor/nginx-1.9.5/src/core/ngx_rwlock.c → vendor/nginx-1.9.6/src/core/ngx_rwlock.c

@@ -111,7 +111,7 @@ ngx_rwlock_unlock(ngx_atomic_t *lock)
 
 #else
 
-#if (NGX_HTTP_UPSTREAM_ZONE)
+#if (NGX_HTTP_UPSTREAM_ZONE || NGX_STREAM_UPSTREAM_ZONE)
 
 #error ngx_atomic_cmp_set() is not defined!
 

vendor/nginx-1.9.5/src/event/ngx_event.c → vendor/nginx-1.9.6/src/event/ngx_event.c

@@ -670,6 +670,15 @@ ngx_event_process_init(ngx_cycle_t *cycle)
         }
     }
 
+#else
+
+    if (ngx_timer_resolution && !(ngx_event_flags & NGX_USE_TIMER_EVENT)) {
+        ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
+                      "the \"timer_resolution\" directive is not supported "
+                      "with the configured event method, ignored");
+        ngx_timer_resolution = 0;
+    }
+
 #endif
 
     cycle->connections =