nginxtra 1.8.1.12 → 1.10.1.12

data/vendor/nginx/src/stream/ngx_stream_upstream_round_robin.h

@@ -0,0 +1,139 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_STREAM_UPSTREAM_ROUND_ROBIN_H_INCLUDED_
+#define _NGX_STREAM_UPSTREAM_ROUND_ROBIN_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct ngx_stream_upstream_rr_peer_s   ngx_stream_upstream_rr_peer_t;
+
+struct ngx_stream_upstream_rr_peer_s {
+    struct sockaddr                 *sockaddr;
+    socklen_t                        socklen;
+    ngx_str_t                        name;
+    ngx_str_t                        server;
+
+    ngx_int_t                        current_weight;
+    ngx_int_t                        effective_weight;
+    ngx_int_t                        weight;
+
+    ngx_uint_t                       conns;
+
+    ngx_uint_t                       fails;
+    time_t                           accessed;
+    time_t                           checked;
+
+    ngx_uint_t                       max_fails;
+    time_t                           fail_timeout;
+
+    ngx_uint_t                       down;         /* unsigned  down:1; */
+
+#if (NGX_STREAM_SSL)
+    void                            *ssl_session;
+    int                              ssl_session_len;
+#endif
+
+    ngx_stream_upstream_rr_peer_t   *next;
+
+#if (NGX_STREAM_UPSTREAM_ZONE)
+    ngx_atomic_t                     lock;
+#endif
+};
+
+
+typedef struct ngx_stream_upstream_rr_peers_s  ngx_stream_upstream_rr_peers_t;
+
+struct ngx_stream_upstream_rr_peers_s {
+    ngx_uint_t                       number;
+
+#if (NGX_STREAM_UPSTREAM_ZONE)
+    ngx_slab_pool_t                 *shpool;
+    ngx_atomic_t                     rwlock;
+    ngx_stream_upstream_rr_peers_t  *zone_next;
+#endif
+
+    ngx_uint_t                       total_weight;
+
+    unsigned                         single:1;
+    unsigned                         weighted:1;
+
+    ngx_str_t                       *name;
+
+    ngx_stream_upstream_rr_peers_t  *next;
+
+    ngx_stream_upstream_rr_peer_t   *peer;
+};
+
+
+#if (NGX_STREAM_UPSTREAM_ZONE)
+
+#define ngx_stream_upstream_rr_peers_rlock(peers)                             \
+                                                                              \
+    if (peers->shpool) {                                                      \
+        ngx_rwlock_rlock(&peers->rwlock);                                     \
+    }
+
+#define ngx_stream_upstream_rr_peers_wlock(peers)                             \
+                                                                              \
+    if (peers->shpool) {                                                      \
+        ngx_rwlock_wlock(&peers->rwlock);                                     \
+    }
+
+#define ngx_stream_upstream_rr_peers_unlock(peers)                            \
+                                                                              \
+    if (peers->shpool) {                                                      \
+        ngx_rwlock_unlock(&peers->rwlock);                                    \
+    }
+
+
+#define ngx_stream_upstream_rr_peer_lock(peers, peer)                         \
+                                                                              \
+    if (peers->shpool) {                                                      \
+        ngx_rwlock_wlock(&peer->lock);                                        \
+    }
+
+#define ngx_stream_upstream_rr_peer_unlock(peers, peer)                       \
+                                                                              \
+    if (peers->shpool) {                                                      \
+        ngx_rwlock_unlock(&peer->lock);                                       \
+    }
+
+#else
+
+#define ngx_stream_upstream_rr_peers_rlock(peers)
+#define ngx_stream_upstream_rr_peers_wlock(peers)
+#define ngx_stream_upstream_rr_peers_unlock(peers)
+#define ngx_stream_upstream_rr_peer_lock(peers, peer)
+#define ngx_stream_upstream_rr_peer_unlock(peers, peer)
+
+#endif
+
+
+typedef struct {
+    ngx_stream_upstream_rr_peers_t  *peers;
+    ngx_stream_upstream_rr_peer_t   *current;
+    uintptr_t                       *tried;
+    uintptr_t                        data;
+} ngx_stream_upstream_rr_peer_data_t;
+
+
+ngx_int_t ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
+    ngx_stream_upstream_srv_conf_t *us);
+ngx_int_t ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
+    ngx_stream_upstream_srv_conf_t *us);
+ngx_int_t ngx_stream_upstream_get_round_robin_peer(ngx_peer_connection_t *pc,
+    void *data);
+void ngx_stream_upstream_free_round_robin_peer(ngx_peer_connection_t *pc,
+    void *data, ngx_uint_t state);
+
+
+#endif /* _NGX_STREAM_UPSTREAM_ROUND_ROBIN_H_INCLUDED_ */

data/vendor/nginx/src/stream/ngx_stream_upstream_zone_module.c

@@ -0,0 +1,242 @@
+
+/*
+ * Copyright (C) Ruslan Ermilov
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+static char *ngx_stream_upstream_zone(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static ngx_int_t ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone,
+    void *data);
+static ngx_stream_upstream_rr_peers_t *ngx_stream_upstream_zone_copy_peers(
+    ngx_slab_pool_t *shpool, ngx_stream_upstream_srv_conf_t *uscf);
+
+
+static ngx_command_t  ngx_stream_upstream_zone_commands[] = {
+
+    { ngx_string("zone"),
+      NGX_STREAM_UPS_CONF|NGX_CONF_TAKE12,
+      ngx_stream_upstream_zone,
+      0,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_upstream_zone_module_ctx = {
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_upstream_zone_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_upstream_zone_module_ctx,  /* module context */
+    ngx_stream_upstream_zone_commands,     /* module directives */
+    NGX_STREAM_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
+};
+
+
+static char *
+ngx_stream_upstream_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ssize_t                           size;
+    ngx_str_t                        *value;
+    ngx_stream_upstream_srv_conf_t   *uscf;
+    ngx_stream_upstream_main_conf_t  *umcf;
+
+    uscf = ngx_stream_conf_get_module_srv_conf(cf, ngx_stream_upstream_module);
+    umcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_upstream_module);
+
+    value = cf->args->elts;
+
+    if (!value[1].len) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid zone name \"%V\"", &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 3) {
+        size = ngx_parse_size(&value[2]);
+
+        if (size == NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid zone size \"%V\"", &value[2]);
+            return NGX_CONF_ERROR;
+        }
+
+        if (size < (ssize_t) (8 * ngx_pagesize)) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "zone \"%V\" is too small", &value[1]);
+            return NGX_CONF_ERROR;
+        }
+
+    } else {
+        size = 0;
+    }
+
+    uscf->shm_zone = ngx_shared_memory_add(cf, &value[1], size,
+                                           &ngx_stream_upstream_module);
+    if (uscf->shm_zone == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    uscf->shm_zone->init = ngx_stream_upstream_init_zone;
+    uscf->shm_zone->data = umcf;
+
+    uscf->shm_zone->noreuse = 1;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
+{
+    size_t                            len;
+    ngx_uint_t                        i;
+    ngx_slab_pool_t                  *shpool;
+    ngx_stream_upstream_rr_peers_t   *peers, **peersp;
+    ngx_stream_upstream_srv_conf_t   *uscf, **uscfp;
+    ngx_stream_upstream_main_conf_t  *umcf;
+
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+    umcf = shm_zone->data;
+    uscfp = umcf->upstreams.elts;
+
+    if (shm_zone->shm.exists) {
+        peers = shpool->data;
+
+        for (i = 0; i < umcf->upstreams.nelts; i++) {
+            uscf = uscfp[i];
+
+            if (uscf->shm_zone != shm_zone) {
+                continue;
+            }
+
+            uscf->peer.data = peers;
+            peers = peers->zone_next;
+        }
+
+        return NGX_OK;
+    }
+
+    len = sizeof(" in upstream zone \"\"") + shm_zone->shm.name.len;
+
+    shpool->log_ctx = ngx_slab_alloc(shpool, len);
+    if (shpool->log_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_sprintf(shpool->log_ctx, " in upstream zone \"%V\"%Z",
+                &shm_zone->shm.name);
+
+
+    /* copy peers to shared memory */
+
+    peersp = (ngx_stream_upstream_rr_peers_t **) (void *) &shpool->data;
+
+    for (i = 0; i < umcf->upstreams.nelts; i++) {
+        uscf = uscfp[i];
+
+        if (uscf->shm_zone != shm_zone) {
+            continue;
+        }
+
+        peers = ngx_stream_upstream_zone_copy_peers(shpool, uscf);
+        if (peers == NULL) {
+            return NGX_ERROR;
+        }
+
+        *peersp = peers;
+        peersp = &peers->zone_next;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_stream_upstream_rr_peers_t *
+ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
+    ngx_stream_upstream_srv_conf_t *uscf)
+{
+    ngx_stream_upstream_rr_peer_t   *peer, **peerp;
+    ngx_stream_upstream_rr_peers_t  *peers, *backup;
+
+    peers = ngx_slab_alloc(shpool, sizeof(ngx_stream_upstream_rr_peers_t));
+    if (peers == NULL) {
+        return NULL;
+    }
+
+    ngx_memcpy(peers, uscf->peer.data, sizeof(ngx_stream_upstream_rr_peers_t));
+
+    peers->shpool = shpool;
+
+    for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
+        /* pool is unlocked */
+        peer = ngx_slab_calloc_locked(shpool,
+                                      sizeof(ngx_stream_upstream_rr_peer_t));
+        if (peer == NULL) {
+            return NULL;
+        }
+
+        ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
+
+        *peerp = peer;
+    }
+
+    if (peers->next == NULL) {
+        goto done;
+    }
+
+    backup = ngx_slab_alloc(shpool, sizeof(ngx_stream_upstream_rr_peers_t));
+    if (backup == NULL) {
+        return NULL;
+    }
+
+    ngx_memcpy(backup, peers->next, sizeof(ngx_stream_upstream_rr_peers_t));
+
+    backup->shpool = shpool;
+
+    for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
+        /* pool is unlocked */
+        peer = ngx_slab_calloc_locked(shpool,
+                                      sizeof(ngx_stream_upstream_rr_peer_t));
+        if (peer == NULL) {
+            return NULL;
+        }
+
+        ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
+
+        *peerp = peer;
+    }
+
+    peers->next = backup;
+
+done:
+
+    uscf->peer.data = peers;
+
+    return peers;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nginxtra
 version: !ruby/object:Gem::Version
-  version: 1.8.1.12
+  version: 1.10.1.12
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -174,6 +174,7 @@ files:
 - vendor/nginx/auto/lib/zlib/makefile.msvc
 - vendor/nginx/auto/lib/zlib/makefile.owc
 - vendor/nginx/auto/make
+- vendor/nginx/auto/module
 - vendor/nginx/auto/modules
 - vendor/nginx/auto/nohave
 - vendor/nginx/auto/options
@@ -245,6 +246,8 @@ files:
 - vendor/nginx/src/core/ngx_log.h
 - vendor/nginx/src/core/ngx_md5.c
 - vendor/nginx/src/core/ngx_md5.h
+- vendor/nginx/src/core/ngx_module.c
+- vendor/nginx/src/core/ngx_module.h
 - vendor/nginx/src/core/ngx_murmurhash.c
 - vendor/nginx/src/core/ngx_murmurhash.h
 - vendor/nginx/src/core/ngx_open_file_cache.c
@@ -254,6 +257,8 @@ files:
 - vendor/nginx/src/core/ngx_palloc.h
 - vendor/nginx/src/core/ngx_parse.c
 - vendor/nginx/src/core/ngx_parse.h
+- vendor/nginx/src/core/ngx_parse_time.c
+- vendor/nginx/src/core/ngx_parse_time.h
 - vendor/nginx/src/core/ngx_proxy_protocol.c
 - vendor/nginx/src/core/ngx_proxy_protocol.h
 - vendor/nginx/src/core/ngx_queue.c
@@ -266,6 +271,8 @@ files:
 - vendor/nginx/src/core/ngx_regex.h
 - vendor/nginx/src/core/ngx_resolver.c
 - vendor/nginx/src/core/ngx_resolver.h
+- vendor/nginx/src/core/ngx_rwlock.c
+- vendor/nginx/src/core/ngx_rwlock.h
 - vendor/nginx/src/core/ngx_sha1.h
 - vendor/nginx/src/core/ngx_shmtx.c
 - vendor/nginx/src/core/ngx_shmtx.h
@@ -280,13 +287,11 @@ files:
 - vendor/nginx/src/core/ngx_thread_pool.h
 - vendor/nginx/src/core/ngx_times.c
 - vendor/nginx/src/core/ngx_times.h
-- vendor/nginx/src/event/modules/ngx_aio_module.c
 - vendor/nginx/src/event/modules/ngx_devpoll_module.c
 - vendor/nginx/src/event/modules/ngx_epoll_module.c
 - vendor/nginx/src/event/modules/ngx_eventport_module.c
 - vendor/nginx/src/event/modules/ngx_kqueue_module.c
 - vendor/nginx/src/event/modules/ngx_poll_module.c
-- vendor/nginx/src/event/modules/ngx_rtsig_module.c
 - vendor/nginx/src/event/modules/ngx_select_module.c
 - vendor/nginx/src/event/modules/ngx_win32_select_module.c
 - vendor/nginx/src/event/ngx_event.c
@@ -339,6 +344,7 @@ files:
 - vendor/nginx/src/http/modules/ngx_http_rewrite_module.c
 - vendor/nginx/src/http/modules/ngx_http_scgi_module.c
 - vendor/nginx/src/http/modules/ngx_http_secure_link_module.c
+- vendor/nginx/src/http/modules/ngx_http_slice_filter_module.c
 - vendor/nginx/src/http/modules/ngx_http_split_clients_module.c
 - vendor/nginx/src/http/modules/ngx_http_ssi_filter_module.c
 - vendor/nginx/src/http/modules/ngx_http_ssi_filter_module.h
@@ -351,6 +357,7 @@ files:
 - vendor/nginx/src/http/modules/ngx_http_upstream_ip_hash_module.c
 - vendor/nginx/src/http/modules/ngx_http_upstream_keepalive_module.c
 - vendor/nginx/src/http/modules/ngx_http_upstream_least_conn_module.c
+- vendor/nginx/src/http/modules/ngx_http_upstream_zone_module.c
 - vendor/nginx/src/http/modules/ngx_http_userid_filter_module.c
 - vendor/nginx/src/http/modules/ngx_http_uwsgi_module.c
 - vendor/nginx/src/http/modules/ngx_http_xslt_filter_module.c
@@ -370,18 +377,12 @@ files:
 - vendor/nginx/src/http/ngx_http_file_cache.c
 - vendor/nginx/src/http/ngx_http_header_filter_module.c
 - vendor/nginx/src/http/ngx_http_parse.c
-- vendor/nginx/src/http/ngx_http_parse_time.c
 - vendor/nginx/src/http/ngx_http_postpone_filter_module.c
 - vendor/nginx/src/http/ngx_http_request.c
 - vendor/nginx/src/http/ngx_http_request.h
 - vendor/nginx/src/http/ngx_http_request_body.c
 - vendor/nginx/src/http/ngx_http_script.c
 - vendor/nginx/src/http/ngx_http_script.h
-- vendor/nginx/src/http/ngx_http_spdy.c
-- vendor/nginx/src/http/ngx_http_spdy.h
-- vendor/nginx/src/http/ngx_http_spdy_filter_module.c
-- vendor/nginx/src/http/ngx_http_spdy_module.c
-- vendor/nginx/src/http/ngx_http_spdy_module.h
 - vendor/nginx/src/http/ngx_http_special_response.c
 - vendor/nginx/src/http/ngx_http_upstream.c
 - vendor/nginx/src/http/ngx_http_upstream.h
@@ -390,6 +391,14 @@ files:
 - vendor/nginx/src/http/ngx_http_variables.c
 - vendor/nginx/src/http/ngx_http_variables.h
 - vendor/nginx/src/http/ngx_http_write_filter_module.c
+- vendor/nginx/src/http/v2/ngx_http_v2.c
+- vendor/nginx/src/http/v2/ngx_http_v2.h
+- vendor/nginx/src/http/v2/ngx_http_v2_filter_module.c
+- vendor/nginx/src/http/v2/ngx_http_v2_huff_decode.c
+- vendor/nginx/src/http/v2/ngx_http_v2_huff_encode.c
+- vendor/nginx/src/http/v2/ngx_http_v2_module.c
+- vendor/nginx/src/http/v2/ngx_http_v2_module.h
+- vendor/nginx/src/http/v2/ngx_http_v2_table.c
 - vendor/nginx/src/mail/ngx_mail.c
 - vendor/nginx/src/mail/ngx_mail.h
 - vendor/nginx/src/mail/ngx_mail_auth_http_module.c
@@ -410,10 +419,6 @@ files:
 - vendor/nginx/src/mail/ngx_mail_ssl_module.h
 - vendor/nginx/src/misc/ngx_cpp_test_module.cpp
 - vendor/nginx/src/misc/ngx_google_perftools_module.c
-- vendor/nginx/src/os/unix/ngx_aio_read.c
-- vendor/nginx/src/os/unix/ngx_aio_read_chain.c
-- vendor/nginx/src/os/unix/ngx_aio_write.c
-- vendor/nginx/src/os/unix/ngx_aio_write_chain.c
 - vendor/nginx/src/os/unix/ngx_alloc.c
 - vendor/nginx/src/os/unix/ngx_alloc.h
 - vendor/nginx/src/os/unix/ngx_atomic.h
@@ -424,6 +429,8 @@ files:
 - vendor/nginx/src/os/unix/ngx_darwin_config.h
 - vendor/nginx/src/os/unix/ngx_darwin_init.c
 - vendor/nginx/src/os/unix/ngx_darwin_sendfile_chain.c
+- vendor/nginx/src/os/unix/ngx_dlopen.c
+- vendor/nginx/src/os/unix/ngx_dlopen.h
 - vendor/nginx/src/os/unix/ngx_errno.c
 - vendor/nginx/src/os/unix/ngx_errno.h
 - vendor/nginx/src/os/unix/ngx_file_aio_read.c
@@ -475,9 +482,26 @@ files:
 - vendor/nginx/src/os/unix/ngx_time.c
 - vendor/nginx/src/os/unix/ngx_time.h
 - vendor/nginx/src/os/unix/ngx_udp_recv.c
+- vendor/nginx/src/os/unix/ngx_udp_send.c
 - vendor/nginx/src/os/unix/ngx_user.c
 - vendor/nginx/src/os/unix/ngx_user.h
 - vendor/nginx/src/os/unix/ngx_writev_chain.c
+- vendor/nginx/src/stream/ngx_stream.c
+- vendor/nginx/src/stream/ngx_stream.h
+- vendor/nginx/src/stream/ngx_stream_access_module.c
+- vendor/nginx/src/stream/ngx_stream_core_module.c
+- vendor/nginx/src/stream/ngx_stream_handler.c
+- vendor/nginx/src/stream/ngx_stream_limit_conn_module.c
+- vendor/nginx/src/stream/ngx_stream_proxy_module.c
+- vendor/nginx/src/stream/ngx_stream_ssl_module.c
+- vendor/nginx/src/stream/ngx_stream_ssl_module.h
+- vendor/nginx/src/stream/ngx_stream_upstream.c
+- vendor/nginx/src/stream/ngx_stream_upstream.h
+- vendor/nginx/src/stream/ngx_stream_upstream_hash_module.c
+- vendor/nginx/src/stream/ngx_stream_upstream_least_conn_module.c
+- vendor/nginx/src/stream/ngx_stream_upstream_round_robin.c
+- vendor/nginx/src/stream/ngx_stream_upstream_round_robin.h
+- vendor/nginx/src/stream/ngx_stream_upstream_zone_module.c
 homepage: https://github.com/smellsblue/nginxtra
 licenses:
 - nginx
@@ -498,7 +522,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Wrapper of nginx for easy install and use.