Compare commits

..

10 Commits

7 changed files with 334 additions and 272 deletions

View File

@ -10,17 +10,19 @@ diff -ur nginx-1.0.15/src/core/nginx.h nginx-1.0.15-patched/src/core/nginx.h
+#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
#define NGINX_VAR "NGINX"
diff -ur nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_array.c
--- nginx-1.0.15/src/core/ngx_array.c 2008-06-17 23:00:30.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_array.c 2011-09-14 12:02:56.263128538 +0800
@@ -39,13 +39,7 @@
diff -urx '*~' -x '*.swp' nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_array.c
--- nginx-1.0.15/src/core/ngx_array.c 2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_array.c 2012-06-04 20:11:32.494144287 +0800
@@ -40,13 +40,11 @@
p = a->pool;
- if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
- p->d.last -= a->size * a->nalloc;
- }
-
+ if (a->elts) {
+ ngx_pfree(p, a->elts);
}
- if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
- p->d.last = (u_char *) a;
- }
@ -28,7 +30,7 @@ diff -ur nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_arr
}
@@ -64,29 +58,17 @@
@@ -65,29 +63,19 @@
p = a->pool;
@ -62,13 +64,15 @@ diff -ur nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_arr
}
+
+ ngx_memcpy(new, a->elts, size);
+
+ ngx_pfree(p, a->elts);
+
+ a->elts = new;
+ a->nalloc *= 2;
+
}
elt = (u_char *) a->elts + a->size * a->nelts;
@@ -100,43 +82,25 @@
@@ -101,43 +89,28 @@
ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
{
void *elt, *new;
@ -116,28 +120,30 @@ diff -ur nginx-1.0.15/src/core/ngx_array.c nginx-1.0.15-patched/src/core/ngx_arr
}
+
+ ngx_memcpy(new, a->elts, a->nelts * a->size);
+
+ ngx_pfree(p, a->elts);
+
+ a->elts = new;
+ a->nalloc = nalloc;
}
elt = (u_char *) a->elts + a->size * a->nelts;
diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_palloc.c
--- nginx-1.0.15/src/core/ngx_palloc.c 2009-12-17 20:25:46.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_palloc.c 2011-09-14 12:03:41.663126519 +0800
@@ -8,24 +8,31 @@
diff -urx '*~' -x '*.swp' nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_palloc.c
--- nginx-1.0.15/src/core/ngx_palloc.c 2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_palloc.c 2012-06-04 20:02:26.667925891 +0800
@@ -9,32 +9,23 @@
#include <ngx_core.h>
-static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
-static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
-
-
ngx_pool_t *
ngx_create_pool(size_t size, ngx_log_t *log)
{
- ngx_pool_t *p;
+ ngx_pool_t *p;
+ ngx_pool_data_t *d;
+ ngx_pool_t *p;
- p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
+ size = sizeof(ngx_pool_t);
@ -150,126 +156,107 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
- p->d.end = (u_char *) p + size;
- p->d.next = NULL;
- p->d.failed = 0;
+ d = ngx_alloc(sizeof(ngx_pool_data_t), log);
+
+ if (d == NULL) {
+ return NULL;
+ }
+
+ d->next = d;
+ d->prev = d;
+ d->alloc = NULL;
+ p->d = d;
+ ngx_memzero(p, size);
size = size - sizeof(ngx_pool_t);
p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
@@ -43,7 +50,7 @@
p->current = p;
- p->chain = NULL;
- p->large = NULL;
- p->cleanup = NULL;
p->log = log;
return p;
@@ -44,8 +35,7 @@
void
ngx_destroy_pool(ngx_pool_t *pool)
{
- ngx_pool_t *p, *n;
- ngx_pool_large_t *l;
+ ngx_pool_data_t *d, *n;
ngx_pool_large_t *l;
ngx_pool_cleanup_t *c;
@@ -55,7 +62,7 @@
for (c = pool->cleanup; c; c = c->next) {
@@ -56,13 +46,9 @@
}
}
- for (l = pool->large; l; l = l->next) {
+ for (l = pool->large; l ; l = l->next) {
-
- ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
-
- if (l->alloc) {
- ngx_free(l->alloc);
- }
+ if (pool->d == NULL) {
+ ngx_free(pool);
+ return;
}
ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
@@ -71,34 +78,45 @@
* so we can not use this log while the free()ing the pool
#if (NGX_DEBUG)
@@ -72,9 +58,9 @@
* so we cannot use this log while free()ing the pool
*/
- for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+ for (d = pool->d, n = d->next; ; d = n, n = n->next) {
ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
- "free: %p, unused: %uz", p, p->d.end - p->d.last);
+ "free: %p", d);
+ "free: %p, unused: %d", d, 0);
- if (n == NULL) {
+ if (n == pool->d) {
if (n == NULL) {
break;
}
}
@@ -83,172 +69,82 @@
#endif
+ if (pool->d->next == pool->d) {
+ ngx_free(pool->d);
+ } else {
+ for (d = pool->d, n = d->next; ; d = n, n = n->next) {
+ if (d->alloc) {
+ ngx_free(d->alloc);
+ }
+ ngx_free(d);
- for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
- ngx_free(p);
-
- if (n == NULL) {
- break;
+ if (n == pool->d) {
+ break;
+ }
+ for (d = pool->d, n = d->next; ; d = n, n = n->next) {
+ ngx_free(d->alloc);
+ ngx_free(d);
if (n == NULL) {
break;
}
}
+
-}
+ pool->d = NULL;
-void
-ngx_reset_pool(ngx_pool_t *pool)
-{
- ngx_pool_t *p;
- ngx_pool_large_t *l;
-
- for (l = pool->large; l; l = l->next) {
- if (l->alloc) {
- ngx_free(l->alloc);
- }
- }
-
- pool->large = NULL;
-
- for (p = pool; p; p = p->d.next) {
- p->d.last = (u_char *) p + sizeof(ngx_pool_t);
- }
+ ngx_free(pool);
}
void
ngx_reset_pool(ngx_pool_t *pool)
{
- ngx_pool_t *p;
- ngx_pool_large_t *l;
+ ngx_pool_data_t *p, *tmp;
+ ngx_pool_large_t *l;
+
+ for (l = pool->large; l ; l = l->next) {
+
+ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
- for (l = pool->large; l; l = l->next) {
if (l->alloc) {
ngx_free(l->alloc);
}
@@ -106,109 +124,65 @@
pool->large = NULL;
- for (p = pool; p; p = p->d.next) {
- p->d.last = (u_char *) p + sizeof(ngx_pool_t);
+ p = pool->d->next;
+ while (p != pool->d) {
+ tmp = p;
+ ngx_free(p->alloc);
+ p->prev->next = p->next;
+ p->next->prev = p->prev;
+ p = p->next;
+ ngx_free(tmp);
}
-}
+ ngx_free(pool->d->alloc);
+ pool->d->alloc = NULL;
+
+}
void *
-void *
-ngx_palloc(ngx_pool_t *pool, size_t size)
+ngx_malloc(ngx_pool_t *pool, size_t size)
+void
+ngx_reset_pool(ngx_pool_t *pool)
{
- u_char *m;
- ngx_pool_t *p;
-
- if (size <= pool->max) {
+ ngx_pool_data_t *new;
+ void *m;
+ ngx_pool_data_t *d, *n;
+ ngx_pool_data_t *saved = NULL;
- p = pool->current;
-
@ -280,37 +267,29 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
- p->d.last = m + size;
-
- return m;
- }
-
+ if (pool->d) {
+ for (d = pool->d, n = d->next; ; d = n, n = n->next) {
+ if (d->alloc == pool->log) {
+ saved = d;
+ continue;
}
- p = p->d.next;
-
- } while (p);
+ m = ngx_alloc(size, pool->log);
+ if (m == NULL) {
+ return NULL;
+ }
- return ngx_palloc_block(pool, size);
+ new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
+ if (new == NULL){
+ ngx_free(m);
+ return NULL;
}
- return ngx_palloc_large(pool, size);
+ new->alloc = m;
+ new->next = pool->d;
+ new->prev = pool->d->prev;
+ pool->d->prev->next = new;
+ pool->d->prev = new;
+ return m;
}
-
void *
- return ngx_palloc_block(pool, size);
- }
-
- return ngx_palloc_large(pool, size);
-}
-
+ ngx_free(d->alloc);
+ ngx_free(d);
-void *
-ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ngx_palloc(ngx_pool_t *pool, size_t size)
{
-{
- u_char *m;
- ngx_pool_t *p;
-
@ -325,37 +304,42 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
- p->d.last = m + size;
-
- return m;
- }
-
+ if (n == NULL) {
+ break;
}
+ }
- p = p->d.next;
-
- } while (p);
-
- return ngx_palloc_block(pool, size);
+ if (size <= 1024) {
+ return ngx_malloc(pool, size);
+ pool->d = saved;
}
return ngx_palloc_large(pool, size);
-
- return ngx_palloc_large(pool, size);
}
-static void *
-ngx_palloc_block(ngx_pool_t *pool, size_t size)
+void *
+ngx_pnalloc(ngx_pool_t *pool, size_t size)
+ngx_malloc(ngx_pool_t *pool, size_t size)
{
- u_char *m;
- size_t psize;
- ngx_pool_t *p, *new, *current;
-
+ ngx_pool_data_t *new;
+ void *m;
- psize = (size_t) (pool->d.end - (u_char *) pool);
-
- m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
- if (m == NULL) {
- return NULL;
- }
-
+ m = ngx_alloc(size, pool->log);
if (m == NULL) {
return NULL;
}
- new = (ngx_pool_t *) m;
-
- new->d.end = m + psize;
@ -372,31 +356,37 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
- if (p->d.failed++ > 4) {
- current = p->d.next;
- }
+ if (size <= 1024) {
+ return ngx_malloc(pool, size);
+ new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
+ if (new == NULL){
+ ngx_free(m);
+ return NULL;
}
- p->d.next = new;
-
- pool->current = current ? current : new;
-
- return m;
+ return ngx_palloc_large(pool, size);
+ new->alloc = m;
+ new->next = pool->d;
+ pool->d = new;
return m;
}
@@ -216,7 +190,6 @@
ngx_palloc_large(ngx_pool_t *pool, size_t size)
-static void *
-ngx_palloc_large(ngx_pool_t *pool, size_t size)
+void *
+ngx_palloc(ngx_pool_t *pool, size_t size)
{
void *p;
- void *p;
- ngx_uint_t n;
ngx_pool_large_t *large;
p = ngx_alloc(size, pool->log);
@@ -224,20 +197,7 @@
return NULL;
}
- ngx_pool_large_t *large;
-
- p = ngx_alloc(size, pool->log);
- if (p == NULL) {
- return NULL;
- }
-
- n = 0;
-
- for (large = pool->large; large; large = large->next) {
@ -411,11 +401,26 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
- }
-
- large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
+ large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
if (large == NULL) {
ngx_free(p);
return NULL;
@@ -262,7 +222,7 @@
- if (large == NULL) {
- ngx_free(p);
- return NULL;
- }
+ return ngx_malloc(pool, size);
+}
- large->alloc = p;
- large->next = pool->large;
- pool->large = large;
- return p;
+void *
+ngx_pnalloc(ngx_pool_t *pool, size_t size)
+{
+ return ngx_malloc(pool, size);
}
@@ -263,7 +159,7 @@
return NULL;
}
@ -424,62 +429,55 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.c nginx-1.0.15-patched/src/core/ngx_pa
if (large == NULL) {
ngx_free(p);
return NULL;
@@ -279,17 +239,41 @@
@@ -278,16 +174,27 @@
ngx_int_t
ngx_pfree(ngx_pool_t *pool, void *p)
-ngx_pfree(ngx_pool_t *pool, void *p)
+ngx_pfree(ngx_pool_t *pool, void *data)
{
- ngx_pool_large_t *l;
+ ngx_pool_large_t *l;
+ ngx_pool_large_t *ll;
+ ngx_pool_data_t *d, *n;
+ ngx_pool_data_t *p, *d;
- for (l = pool->large; l; l = l->next) {
+ for (l = pool->large, ll = l; l; ll = l, l = l->next) {
if (p == l->alloc) {
ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
"free: %p", l->alloc);
ngx_free(l->alloc);
l->alloc = NULL;
+ if (l == pool->large) {
+ pool->large = NULL;
+ }
- if (p == l->alloc) {
- ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
- "free: %p", l->alloc);
- ngx_free(l->alloc);
- l->alloc = NULL;
+ p = NULL;
+ for (d = pool->d; d; p = d, d = d->next) {
+ if (data == d->alloc) {
+
+ ll->next = l->next;
+ p = l;
+ break;
+ }
+ }
+ for (d = pool->d, n = d->next; ; d = n, n = d->next) {
+ if (p == d->alloc) {
+ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
+ if (d->alloc) {
+ ngx_free(d->alloc);
+ }
+
+ ngx_free(d->alloc);
+ d->alloc = NULL;
+ d->prev->next = d->next;
+ d->next->prev = d->prev;
+
+ if (p) {
+ p->next = d->next;
+
+ } else {
+ pool->d = d->next;
+ }
+
+ ngx_free(d);
return NGX_OK;
}
+ if (d->next == pool->d) {
+ break;
+ }
}
return NGX_DECLINED;
diff -ur nginx-1.0.15/src/core/ngx_palloc.h nginx-1.0.15-patched/src/core/ngx_palloc.h
--- nginx-1.0.15/src/core/ngx_palloc.h 2009-12-17 20:25:46.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_palloc.h 2011-09-13 12:11:03.155622101 +0800
@@ -38,6 +38,7 @@
diff -urx '*~' -x '*.swp' nginx-1.0.15/src/core/ngx_palloc.h nginx-1.0.15-patched/src/core/ngx_palloc.h
--- nginx-1.0.15/src/core/ngx_palloc.h 2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_palloc.h 2012-06-04 19:39:32.803578356 +0800
@@ -39,6 +39,8 @@
typedef struct ngx_pool_large_s ngx_pool_large_t;
+typedef struct ngx_pool_data_s ngx_pool_data_t;
+
struct ngx_pool_large_s {
ngx_pool_large_t *next;
@@ -45,16 +46,15 @@
@@ -46,16 +48,14 @@
};
@ -489,10 +487,9 @@ diff -ur nginx-1.0.15/src/core/ngx_palloc.h nginx-1.0.15-patched/src/core/ngx_pa
- ngx_pool_t *next;
- ngx_uint_t failed;
-} ngx_pool_data_t;
+struct ngx_pool_data_s{
+ ngx_pool_data_t *next;
+ ngx_pool_data_t *prev;
+ void *alloc;
+struct ngx_pool_data_s {
+ ngx_pool_data_t *next;
+ void *alloc;
+};

View File

@ -0,0 +1,36 @@
--- nginx-1.0.15/src/event/modules/ngx_poll_module.c 2012-02-06 04:02:59.000000000 +0800
+++ nginx-1.0.15-patched/src/event/modules/ngx_poll_module.c 2012-06-07 17:22:43.538168219 +0800
@@ -205,19 +205,21 @@
event_list[ev->index] = event_list[nevents];
- c = ngx_cycle->files[event_list[nevents].fd];
+ if (ngx_cycle->files) {
+ c = ngx_cycle->files[event_list[nevents].fd];
- if (c->fd == -1) {
- ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
- "unexpected last event");
-
- } else {
- if (c->read->index == (ngx_uint_t) nevents) {
- c->read->index = ev->index;
- }
-
- if (c->write->index == (ngx_uint_t) nevents) {
- c->write->index = ev->index;
+ if (c->fd == -1) {
+ ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+ "unexpected last event");
+
+ } else {
+ if (c->read->index == (ngx_uint_t) nevents) {
+ c->read->index = ev->index;
+ }
+
+ if (c->write->index == (ngx_uint_t) nevents) {
+ c->write->index = ev->index;
+ }
}
}
}

View File

@ -0,0 +1,11 @@
--- nginx-1.0.15/src/core/ngx_resolver.c 2012-03-05 21:17:56.000000000 +0800
+++ nginx-1.0.15-patched/src/core/ngx_resolver.c 2012-06-01 17:55:55.861130605 +0800
@@ -987,7 +987,7 @@
nan = (query->nan_hi << 8) + query->nan_lo;
ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
- "resolver DNS response %ui fl:%04Xui %ui/%ui/%ui/%ui",
+ "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
ident, flags, nqs, nan,
(query->nns_hi << 8) + query->nns_lo,
(query->nar_hi << 8) + query->nar_lo);

View File

@ -0,0 +1,11 @@
--- nginx-1.3.0/src/core/ngx_resolver.c 2012-05-14 17:13:45.000000000 +0800
+++ nginx-1.3.0-patched/src/core/ngx_resolver.c 2012-06-01 18:08:06.512047421 +0800
@@ -1035,7 +1035,7 @@
nan = (query->nan_hi << 8) + query->nan_lo;
ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
- "resolver DNS response %ui fl:%04Xui %ui/%ui/%ui/%ui",
+ "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
ident, flags, nqs, nan,
(query->nns_hi << 8) + query->nns_lo,
(query->nar_hi << 8) + query->nar_lo);

View File

@ -219,7 +219,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -228,7 +228,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -286,7 +286,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -295,7 +295,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -362,7 +362,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -371,7 +371,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -429,7 +429,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -438,7 +438,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -495,7 +495,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -504,7 +504,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib -llua' \
--with-http_ssl_module
@ -569,7 +569,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -628,7 +628,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -671,7 +671,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -680,7 +680,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -924,7 +924,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -933,7 +933,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -990,7 +990,7 @@ cd nginx-1.0.15
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../drizzle-nginx-module-0.1.2rc7 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -999,7 +999,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -1056,7 +1056,7 @@ cd nginx-1.0.15
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../drizzle-nginx-module-0.1.2rc7 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1065,7 +1065,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -1135,7 +1135,7 @@ cd nginx-1.0.15
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../drizzle-nginx-module-0.1.2rc7 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1144,7 +1144,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/opt/drizzle/lib' \
--with-http_ssl_module
@ -1201,7 +1201,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1210,7 +1210,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-cc=gcc-4.2 --with-http_ssl_module
cd ../..
@ -1268,7 +1268,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1277,7 +1277,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -1336,7 +1336,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1345,7 +1345,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-cc=cl --with-http_ssl_module
@ -1416,7 +1416,7 @@ cd nginx-1.0.15
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_postgres-0.9 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1425,7 +1425,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/opt/postgres/lib' \
--with-http_ssl_module
@ -1483,7 +1483,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1492,7 +1492,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -1571,7 +1571,7 @@ cd nginx-1.0.15
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_postgres-0.9 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1580,7 +1580,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/lib64' \
--with-http_ssl_module
@ -1648,7 +1648,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1657,7 +1657,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -1713,7 +1713,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1722,7 +1722,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -1779,7 +1779,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1788,7 +1788,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -1845,7 +1845,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1854,7 +1854,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -1910,7 +1910,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1919,7 +1919,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -1978,7 +1978,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -1987,7 +1987,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -2043,7 +2043,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2052,7 +2052,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -2106,7 +2106,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2115,7 +2115,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -2167,7 +2167,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2176,7 +2176,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -2226,7 +2226,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2235,7 +2235,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/tmp/luajit/lib' \
--with-http_ssl_module
@ -2297,7 +2297,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2306,7 +2306,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/tmp/lua/lib' \
--with-http_ssl_module
@ -2361,7 +2361,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2370,7 +2370,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -2426,7 +2426,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2435,7 +2435,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -2492,7 +2492,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2501,7 +2501,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--add-module=/path/to/some/module --add-module=$OPENRESTY_DIR/../some/module --with-http_ssl_module
cd ../..
@ -2557,7 +2557,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2566,7 +2566,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-openssl=$OPENRESTY_DIR/../some/module --with-http_ssl_module
cd ../..
@ -2622,7 +2622,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2631,7 +2631,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -2686,7 +2686,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2695,7 +2695,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-http_ssl_module
cd ../..
@ -2750,7 +2750,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2759,7 +2759,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module
@ -2818,7 +2818,7 @@ cd nginx-1.0.15
--add-module=../set-misc-nginx-module-0.22rc8 \
--add-module=../form-input-nginx-module-0.07rc5 \
--add-module=../encrypted-session-nginx-module-0.02 \
--add-module=../ngx_lua-0.5.0rc29 \
--add-module=../ngx_lua-0.5.0rc30 \
--add-module=../headers-more-nginx-module-0.17rc1 \
--add-module=../srcache-nginx-module-0.13rc8 \
--add-module=../array-var-nginx-module-0.03rc1 \
@ -2827,7 +2827,7 @@ cd nginx-1.0.15
--add-module=../redis-nginx-module-0.3.6 \
--add-module=../upstream-keepalive-nginx-module-0.7 \
--add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.12rc9 \
--add-module=../rds-json-nginx-module-0.12rc10 \
--add-module=../rds-csv-nginx-module-0.05rc2 \
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
--with-http_ssl_module

View File

@ -69,6 +69,12 @@ patch -p1 < $root/patches/nginx-$main_ver-filter_finalize_hang.patch || exit 1
echo applying add_core_vars_polluting_globals.patch ...
patch -p1 < $root/patches/nginx-$main_ver-add_core_vars_polluting_globals.patch || exit 1
echo applying resolver_debug_log_overflow.patch ...
patch -p1 < $root/patches/nginx-$main_ver-resolver_debug_log_overflow.patch || exit 1
echo applying poll_del_event_at_exit.patch ...
patch -p1 < $root/patches/nginx-$main_ver-poll_del_event_at_exit.patch
#echo "INFO: applying null-character-fixes patch"
#patch -p0 < $root/patches/nginx-$main_ver-null_character_fixes.patch || exit 1
@ -105,7 +111,7 @@ $root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/
tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
ver=0.12rc9
ver=0.12rc10
$root/util/get-tarball "http://github.com/agentzh/rds-json-nginx-module/tarball/v$ver" -O rds-json-nginx-module-$ver.tar.gz || exit 1
tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1
@ -129,7 +135,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.5.0rc29
ver=0.5.0rc30
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
@ -318,6 +324,7 @@ cd ..
cp $root/util/configure ./
cp $root/README ./
cp $root/util/install bundle/
find bundle -name '*~' -delete
cd $root

View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.0.15
minor_ver=7
minor_ver=10
version=$main_ver.$minor_ver
echo $version