nginxtra 1.6.3.9 → 1.8.0.9

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: nginxtra
 version: !ruby/object:Gem::Version
-  version: 1.6.3.9
+  version: 1.8.0.9
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
 description: This gem is intended to provide an easy to use configuration file that
@@ -117,7 +117,6 @@ files:
 - vendor/nginx/auto/lib/zlib/makefile.bcc
 - vendor/nginx/auto/lib/zlib/makefile.msvc
 - vendor/nginx/auto/lib/zlib/makefile.owc
-- vendor/nginx/auto/lib/zlib/patch.zlib.h
 - vendor/nginx/auto/make
 - vendor/nginx/auto/modules
 - vendor/nginx/auto/nohave
@@ -131,6 +130,7 @@ files:
 - vendor/nginx/auto/sources
 - vendor/nginx/auto/stubs
 - vendor/nginx/auto/summary
+- vendor/nginx/auto/threads
 - vendor/nginx/auto/types/sizeof
 - vendor/nginx/auto/types/typedef
 - vendor/nginx/auto/types/uintptr_t
@@ -218,6 +218,10 @@ files:
 - vendor/nginx/src/core/ngx_spinlock.c
 - vendor/nginx/src/core/ngx_string.c
 - vendor/nginx/src/core/ngx_string.h
+- vendor/nginx/src/core/ngx_syslog.c
+- vendor/nginx/src/core/ngx_syslog.h
+- vendor/nginx/src/core/ngx_thread_pool.c
+- 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
@@ -232,11 +236,8 @@ files:
 - vendor/nginx/src/event/ngx_event.c
 - vendor/nginx/src/event/ngx_event.h
 - vendor/nginx/src/event/ngx_event_accept.c
-- vendor/nginx/src/event/ngx_event_busy_lock.c
-- vendor/nginx/src/event/ngx_event_busy_lock.h
 - vendor/nginx/src/event/ngx_event_connect.c
 - vendor/nginx/src/event/ngx_event_connect.h
-- vendor/nginx/src/event/ngx_event_mutex.c
 - vendor/nginx/src/event/ngx_event_openssl.c
 - vendor/nginx/src/event/ngx_event_openssl.h
 - vendor/nginx/src/event/ngx_event_openssl_stapling.c
@@ -290,6 +291,7 @@ files:
 - vendor/nginx/src/http/modules/ngx_http_static_module.c
 - vendor/nginx/src/http/modules/ngx_http_stub_status_module.c
 - vendor/nginx/src/http/modules/ngx_http_sub_filter_module.c
+- vendor/nginx/src/http/modules/ngx_http_upstream_hash_module.c
 - 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
@@ -304,8 +306,6 @@ files:
 - vendor/nginx/src/http/modules/perl/typemap
 - vendor/nginx/src/http/ngx_http.c
 - vendor/nginx/src/http/ngx_http.h
-- vendor/nginx/src/http/ngx_http_busy_lock.c
-- vendor/nginx/src/http/ngx_http_busy_lock.h
 - vendor/nginx/src/http/ngx_http_cache.h
 - vendor/nginx/src/http/ngx_http_config.h
 - vendor/nginx/src/http/ngx_http_copy_filter_module.c
@@ -376,8 +376,6 @@ files:
 - vendor/nginx/src/os/unix/ngx_freebsd.h
 - vendor/nginx/src/os/unix/ngx_freebsd_config.h
 - vendor/nginx/src/os/unix/ngx_freebsd_init.c
-- vendor/nginx/src/os/unix/ngx_freebsd_rfork_thread.c
-- vendor/nginx/src/os/unix/ngx_freebsd_rfork_thread.h
 - vendor/nginx/src/os/unix/ngx_freebsd_sendfile_chain.c
 - vendor/nginx/src/os/unix/ngx_gcc_atomic_amd64.h
 - vendor/nginx/src/os/unix/ngx_gcc_atomic_ppc.h
@@ -395,7 +393,6 @@ files:
 - vendor/nginx/src/os/unix/ngx_process.h
 - vendor/nginx/src/os/unix/ngx_process_cycle.c
 - vendor/nginx/src/os/unix/ngx_process_cycle.h
-- vendor/nginx/src/os/unix/ngx_pthread_thread.c
 - vendor/nginx/src/os/unix/ngx_readv_chain.c
 - vendor/nginx/src/os/unix/ngx_recv.c
 - vendor/nginx/src/os/unix/ngx_send.c
@@ -416,13 +413,15 @@ files:
 - vendor/nginx/src/os/unix/ngx_sunpro_sparc64.il
 - vendor/nginx/src/os/unix/ngx_sunpro_x86.il
 - vendor/nginx/src/os/unix/ngx_thread.h
+- vendor/nginx/src/os/unix/ngx_thread_cond.c
+- vendor/nginx/src/os/unix/ngx_thread_id.c
+- vendor/nginx/src/os/unix/ngx_thread_mutex.c
 - 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_user.c
 - vendor/nginx/src/os/unix/ngx_user.h
 - vendor/nginx/src/os/unix/ngx_writev_chain.c
-- vendor/nginx/src/os/unix/rfork_thread.S
 homepage: https://github.com/mikestone/nginxtra
 licenses:
 - nginx
@@ -433,17 +432,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Wrapper of nginx for easy install and use.

data/vendor/nginx/auto/lib/zlib/patch.zlib.h

@@ -1,10 +0,0 @@
---- zlib.h	Thu Jul  9 20:06:56 1998
-+++ zlib-1.1.3/zlib.h	Tue Mar 22 13:41:04 2005
-@@ -709,7 +709,6 @@
-    (0 in case of error).
- */
- 
--ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
- /*
-      Converts, formats, and writes the args to the compressed file under
-    control of the format string, as in fprintf. gzprintf returns the number of

data/vendor/nginx/src/event/ngx_event_busy_lock.c

@@ -1,286 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-
-
-static ngx_int_t ngx_event_busy_lock_look_cacheable(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx);
-static void ngx_event_busy_lock_handler(ngx_event_t *ev);
-static void ngx_event_busy_lock_posted_handler(ngx_event_t *ev);
-
-
-/*
- * NGX_OK:     the busy lock is held
- * NGX_AGAIN:  the all busy locks are held but we will wait the specified time
- * NGX_BUSY:   ctx->timer == 0: there are many the busy locks
- *             ctx->timer != 0: there are many the waiting locks
- */
-
-ngx_int_t
-ngx_event_busy_lock(ngx_event_busy_lock_t *bl, ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_int_t  rc;
-
-    ngx_mutex_lock(bl->mutex);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->event->log, 0,
-                   "event busy lock: b:%d mb:%d",
-                   bl->busy, bl->max_busy);
-
-    if (bl->busy < bl->max_busy) {
-        bl->busy++;
-
-        rc = NGX_OK;
-
-    } else if (ctx->timer && bl->waiting < bl->max_waiting) {
-        bl->waiting++;
-        ngx_add_timer(ctx->event, ctx->timer);
-        ctx->event->handler = ngx_event_busy_lock_handler;
-
-        if (bl->events) {
-            bl->last->next = ctx;
-
-        } else {
-            bl->events = ctx;
-        }
-
-        bl->last = ctx;
-
-        rc = NGX_AGAIN;
-
-    } else {
-        rc = NGX_BUSY;
-    }
-
-    ngx_mutex_unlock(bl->mutex);
-
-    return rc;
-}
-
-
-ngx_int_t
-ngx_event_busy_lock_cacheable(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_int_t  rc;
-
-    ngx_mutex_lock(bl->mutex);
-
-    rc = ngx_event_busy_lock_look_cacheable(bl, ctx);
-
-    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ctx->event->log, 0,
-                   "event busy lock: %d w:%d mw:%d",
-                   rc, bl->waiting, bl->max_waiting);
-
-    /*
-     * NGX_OK:     no the same request, there is free slot and we locked it
-     * NGX_BUSY:   no the same request and there is no free slot
-     * NGX_AGAIN:  the same request is processing
-     */
-
-    if (rc == NGX_AGAIN) {
-
-        if (ctx->timer && bl->waiting < bl->max_waiting) {
-            bl->waiting++;
-            ngx_add_timer(ctx->event, ctx->timer);
-            ctx->event->handler = ngx_event_busy_lock_handler;
-
-            if (bl->events == NULL) {
-                bl->events = ctx;
-            } else {
-                bl->last->next = ctx;
-            }
-            bl->last = ctx;
-
-        } else {
-            rc = NGX_BUSY;
-        }
-    }
-
-    ngx_mutex_unlock(bl->mutex);
-
-    return rc;
-}
-
-
-void
-ngx_event_busy_unlock(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_event_t                *ev;
-    ngx_event_busy_lock_ctx_t  *wakeup;
-
-    ngx_mutex_lock(bl->mutex);
-
-    if (bl->events) {
-        wakeup = bl->events;
-        bl->events = bl->events->next;
-
-    } else {
-        wakeup = NULL;
-        bl->busy--;
-    }
-
-    /*
-     * MP: all ctx's and their queue must be in shared memory,
-     *     each ctx has pid to wake up
-     */
-
-    if (wakeup == NULL) {
-        ngx_mutex_unlock(bl->mutex);
-        return;
-    }
-
-    if (ctx->md5) {
-        for (wakeup = bl->events; wakeup; wakeup = wakeup->next) {
-            if (wakeup->md5 == NULL || wakeup->slot != ctx->slot) {
-                continue;
-            }
-
-            wakeup->handler = ngx_event_busy_lock_posted_handler;
-            wakeup->cache_updated = 1;
-
-            ev = wakeup->event;
-
-            ngx_post_event(ev, &ngx_posted_events);
-        }
-
-        ngx_mutex_unlock(bl->mutex);
-
-    } else {
-        bl->waiting--;
-
-        ngx_mutex_unlock(bl->mutex);
-
-        wakeup->handler = ngx_event_busy_lock_posted_handler;
-        wakeup->locked = 1;
-
-        ev = wakeup->event;
-
-        if (ev->timer_set) {
-            ngx_del_timer(ev);
-        }
-
-        ngx_post_event(ev, &ngx_posted_events);
-    }
-}
-
-
-void
-ngx_event_busy_lock_cancel(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_event_busy_lock_ctx_t  *c, *p;
-
-    ngx_mutex_lock(bl->mutex);
-
-    bl->waiting--;
-
-    if (ctx == bl->events) {
-        bl->events = ctx->next;
-
-    } else {
-        p = bl->events;
-        for (c = bl->events->next; c; c = c->next) {
-            if (c == ctx) {
-                p->next = ctx->next;
-                break;
-            }
-            p = c;
-        }
-    }
-
-    ngx_mutex_unlock(bl->mutex);
-}
-
-
-static ngx_int_t
-ngx_event_busy_lock_look_cacheable(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_int_t    free;
-    ngx_uint_t   i, bit, cacheable, mask;
-
-    bit = 0;
-    cacheable = 0;
-    free = -1;
-
-#if (NGX_SUPPRESS_WARN)
-    mask = 0;
-#endif
-
-    for (i = 0; i < bl->max_busy; i++) {
-
-        if ((bit & 7) == 0) {
-            mask = bl->md5_mask[i / 8];
-        }
-
-        if (mask & 1) {
-            if (ngx_memcmp(&bl->md5[i * 16], ctx->md5, 16) == 0) {
-                ctx->waiting = 1;
-                ctx->slot = i;
-                return NGX_AGAIN;
-            }
-            cacheable++;
-
-        } else if (free == -1) {
-            free = i;
-        }
-
-        if (cacheable == bl->cacheable) {
-            if (free == -1 && cacheable < bl->max_busy) {
-                free = i + 1;
-            }
-
-            break;
-        }
-
-        mask >>= 1;
-        bit++;
-    }
-
-    if (free == -1) {
-        return NGX_BUSY;
-    }
-
-#if 0
-    if (bl->busy == bl->max_busy) {
-        return NGX_BUSY;
-    }
-#endif
-
-    ngx_memcpy(&bl->md5[free * 16], ctx->md5, 16);
-    bl->md5_mask[free / 8] |= 1 << (free & 7);
-    ctx->slot = free;
-
-    bl->cacheable++;
-    bl->busy++;
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_event_busy_lock_handler(ngx_event_t *ev)
-{
-    ev->handler = ngx_event_busy_lock_posted_handler;
-
-    ngx_post_event(ev, &ngx_posted_events);
-}
-
-
-static void
-ngx_event_busy_lock_posted_handler(ngx_event_t *ev)
-{
-    ngx_event_busy_lock_ctx_t  *ctx;
-
-    ctx = ev->data;
-    ctx->handler(ev);
-}

data/vendor/nginx/src/event/ngx_event_busy_lock.h

@@ -1,65 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-
-
-#ifndef _NGX_EVENT_BUSY_LOCK_H_INCLUDED_
-#define _NGX_EVENT_BUSY_LOCK_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-
-typedef struct ngx_event_busy_lock_ctx_s  ngx_event_busy_lock_ctx_t;
-
-struct ngx_event_busy_lock_ctx_s {
-    ngx_event_t                *event;
-    ngx_event_handler_pt        handler;
-    void                       *data;
-    ngx_msec_t                  timer;
-
-    unsigned                    locked:1;
-    unsigned                    waiting:1;
-    unsigned                    cache_updated:1;
-
-    char                       *md5;
-    ngx_int_t                   slot;
-
-    ngx_event_busy_lock_ctx_t  *next;
-};
-
-
-typedef struct {
-    u_char                     *md5_mask;
-    char                       *md5;
-    ngx_uint_t                  cacheable;
-
-    ngx_uint_t                  busy;
-    ngx_uint_t                  max_busy;
-
-    ngx_uint_t                  waiting;
-    ngx_uint_t                  max_waiting;
-
-    ngx_event_busy_lock_ctx_t  *events;
-    ngx_event_busy_lock_ctx_t  *last;
-
-#if (NGX_THREADS)
-    ngx_mutex_t                *mutex;
-#endif
-} ngx_event_busy_lock_t;
-
-
-ngx_int_t ngx_event_busy_lock(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx);
-ngx_int_t ngx_event_busy_lock_cacheable(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx);
-void ngx_event_busy_unlock(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx);
-void ngx_event_busy_lock_cancel(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx);
-
-
-#endif /* _NGX_EVENT_BUSY_LOCK_H_INCLUDED_ */