releng work for the 1.0.15.10 release.

This reverts commit 950eafe167.

We should prepare for a stable version 1.0.15.10 first :)

patches/nginx-1.0.15-add_core_vars_polluting_globals.patch

@@ -0,0 +1,26 @@
+--- nginx-1.0.15/src/http/ngx_http_variables.c	2012-03-05 20:36:51.000000000 +0800
++++ nginx-1.0.15-patched/src/http/ngx_http_variables.c	2012-05-17 16:21:42.120968722 +0800
+@@ -1898,6 +1898,7 @@
+ {
+     ngx_int_t                   rc;
+     ngx_http_variable_t        *v;
++    ngx_http_variable_t        *value;
+     ngx_http_core_main_conf_t  *cmcf;
+ 
+     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+@@ -1918,7 +1919,14 @@
+     }
+ 
+     for (v = ngx_http_core_variables; v->name.len; v++) {
+-        rc = ngx_hash_add_key(cmcf->variables_keys, &v->name, v,
++        value = ngx_palloc(cf->pool, sizeof(ngx_http_variable_t));
++        if (value == NULL) {
++            return NGX_ERROR;
++        }
++
++        *value = *v;
++
++        rc = ngx_hash_add_key(cmcf->variables_keys, &value->name, value,
+                               NGX_HASH_READONLY_KEY);
+ 
+         if (rc == NGX_OK) {

patches/nginx-1.0.15-epoll_check_stale_wev.patch

@@ -1,20 +0,0 @@
---- nginx-1.0.15/src/event/modules/ngx_epoll_module.c	2011-09-30 22:12:53.000000000 +0800
-+++ nginx-1.0.15-patched/src/event/modules/ngx_epoll_module.c	2011-11-30 11:08:46.775817019 +0800
-@@ -682,6 +682,17 @@
-         wev = c->write;
- 
-         if ((revents & EPOLLOUT) && wev->active) {
-+            if (c->fd == -1 || wev->instance != instance) {
-+
-+                /*
-+                 * the stale event from a file descriptor
-+                 * that was just closed in this iteration
-+                 */
-+
-+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-+                               "epoll: stale event %p", c);
-+                continue;
-+            }
- 
-             if (flags & NGX_POST_THREAD_EVENTS) {
-                 wev->posted_ready = 1;

patches/nginx-1.0.15-filter_finalize_hang.patch

@@ -0,0 +1,10 @@
+--- nginx-1.0.15/src/http/ngx_http_request.c	2012-03-05 20:49:32.000000000 +0800
++++ nginx-1.0.15-patched/src/http/ngx_http_request.c	2012-05-22 20:46:57.000000000 +0800
+@@ -1900,7 +1900,6 @@
+ 
+     if (rc == NGX_OK && r->filter_finalize) {
+         c->error = 1;
+-        return;
+     }
+ 
+     if (rc == NGX_DECLINED) {

patches/nginx-1.0.15-no_pool.patch

@@ -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;
  
 -    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);
++    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;
 -
--        if (n == NULL) {
--            break;
-+            if (n == pool->d) {
-+                break;
-+            }
-         }
-     }
-+
+-    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) {
++
++            ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
++
++            ngx_free(d->alloc);
++            d->alloc = NULL;
++
++            if (p) {
++                p->next = d->next;
++
++            } else {
++                pool->d = d->next;
 +            }
 +
-+            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);
-+            }
-+            d->alloc = NULL;
-+            d->prev->next = d->next;
-+            d->next->prev = d->prev;
 +            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,9 +487,8 @@ 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{
++struct ngx_pool_data_s {
 +    ngx_pool_data_t        *next;
-+    ngx_pool_data_t		*prev;
 +    void                   *alloc;
 +};
  

patches/nginx-1.0.15-poll_del_event_at_exit.patch

@@ -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;
++                    }
+                 }
+             }
+         }

patches/nginx-1.0.15-reset_wev_handler_in_named_locations.patch

@@ -0,0 +1,11 @@
+--- nginx-1.0.15/src/http/ngx_http_core_module.c	2012-03-05 21:03:39.000000000 +0800
++++ nginx-1.0.15-patched/src/http/ngx_http_core_module.c	2012-05-02 21:57:40.624937882 +0800
+@@ -2567,6 +2567,8 @@
+ 
+             r->phase_handler = cmcf->phase_engine.location_rewrite_index;
+ 
++            r->write_event_handler = ngx_http_core_run_phases;
++
+             ngx_http_core_run_phases(r);
+ 
+             return NGX_DONE;

patches/nginx-1.0.15-resolver_debug_log_overflow.patch

@@ -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);

patches/nginx-1.1.15-epoll_check_stale_wev.patch

@@ -1,20 +0,0 @@
---- nginx-1.1.15/src/event/modules/ngx_epoll_module.c	2011-09-30 22:12:53.000000000 +0800
-+++ nginx-1.1.15-patched/src/event/modules/ngx_epoll_module.c	2011-11-30 11:08:46.775817019 +0800
-@@ -682,6 +682,17 @@
-         wev = c->write;
- 
-         if ((revents & EPOLLOUT) && wev->active) {
-+            if (c->fd == -1 || wev->instance != instance) {
-+
-+                /*
-+                 * the stale event from a file descriptor
-+                 * that was just closed in this iteration
-+                 */
-+
-+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-+                               "epoll: stale event %p", c);
-+                continue;
-+            }
- 
-             if (flags & NGX_POST_THREAD_EVENTS) {
-                 wev->posted_ready = 1;

patches/nginx-1.1.15-null_character_fixes.patch

@@ -1,113 +0,0 @@
---- src/http/modules/ngx_http_fastcgi_module.c
-+++ src/http/modules/ngx_http_fastcgi_module.c
-@@ -1501,10 +1501,10 @@ ngx_http_fastcgi_process_header(ngx_http
-                     h->lowcase_key = h->key.data + h->key.len + 1
-                                      + h->value.len + 1;
- 
--                    ngx_cpystrn(h->key.data, r->header_name_start,
--                                h->key.len + 1);
--                    ngx_cpystrn(h->value.data, r->header_start,
--                                h->value.len + 1);
-+                    ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+                    h->key.data[h->key.len] = '\0';
-+                    ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+                    h->value.data[h->value.len] = '\0';
-                 }
- 
-                 h->hash = r->header_hash;
---- src/http/modules/ngx_http_proxy_module.c
-+++ src/http/modules/ngx_http_proxy_module.c
-@@ -1381,8 +1381,10 @@ ngx_http_proxy_process_header(ngx_http_r
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
--            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
--            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
---- src/http/modules/ngx_http_scgi_module.c
-+++ src/http/modules/ngx_http_scgi_module.c
-@@ -941,8 +941,10 @@ ngx_http_scgi_process_header(ngx_http_re
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
--            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
--            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
---- src/http/modules/ngx_http_uwsgi_module.c
-+++ src/http/modules/ngx_http_uwsgi_module.c
-@@ -985,8 +985,10 @@ ngx_http_uwsgi_process_header(ngx_http_r
-             h->value.data = h->key.data + h->key.len + 1;
-             h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
- 
--            ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
--            ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
-+            ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
-+            h->key.data[h->key.len] = '\0';
-+            ngx_memcpy(h->value.data, r->header_start, h->value.len);
-+            h->value.data[h->value.len] = '\0';
- 
-             if (h->key.len == r->lowcase_index) {
-                 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
---- src/http/ngx_http_parse.c
-+++ src/http/ngx_http_parse.c
-@@ -874,6 +874,10 @@ ngx_http_parse_header_line(ngx_http_requ
-                     break;
-                 }
- 
-+                if (ch == '\0') {
-+                    return NGX_HTTP_PARSE_INVALID_HEADER;
-+                }
-+
-                 r->invalid_header = 1;
- 
-                 break;
-@@ -936,6 +940,10 @@ ngx_http_parse_header_line(ngx_http_requ
-                 break;
-             }
- 
-+            if (ch == '\0') {
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-+            }
-+
-             r->invalid_header = 1;
- 
-             break;
-@@ -954,6 +962,8 @@ ngx_http_parse_header_line(ngx_http_requ
-                 r->header_start = p;
-                 r->header_end = p;
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             default:
-                 r->header_start = p;
-                 state = sw_value;
-@@ -975,6 +985,8 @@ ngx_http_parse_header_line(ngx_http_requ
-             case LF:
-                 r->header_end = p;
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             }
-             break;
- 
-@@ -988,6 +1000,8 @@ ngx_http_parse_header_line(ngx_http_requ
-                 break;
-             case LF:
-                 goto done;
-+            case '\0':
-+                return NGX_HTTP_PARSE_INVALID_HEADER;
-             default:
-                 state = sw_value;
-                 break;

patches/nginx-1.1.15-request_body_in_single_buf.patch

@@ -1,27 +0,0 @@
-# HG changeset patch
-# User Maxim Dounin <mdounin@mdounin.ru>
-# Date 1309799136 -14400
-# Node ID 99e276bba8596bc4df9e638482ee413f4c6bf700
-# Parent  e7b2f945d55ae44a2295facf9e3336dc4633e5b5
-Core: fix body with request_body_in_single_buf.
-
-If there were preread data and request body was big enough first part
-of request body was duplicated.
-
-See report here:
-http://nginx.org/pipermail/nginx/2011-July/027756.html
-
-diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
---- a/src/http/ngx_http_request_body.c
-+++ b/src/http/ngx_http_request_body.c
-@@ -372,7 +372,9 @@ ngx_http_do_read_client_request_body(ngx
-         }
-     }
- 
--    if (r->request_body_in_file_only && rb->bufs->next) {
-+    if (rb->bufs->next
-+        && (r->request_body_in_file_only || r->request_body_in_single_buf))
-+    {
-         rb->bufs = rb->bufs->next;
-     }
- 

patches/nginx-1.1.15-request_body_preread_fix.patch

@@ -1,17 +0,0 @@
-# HG changeset patch
-# User Maxim Dounin <mdounin@mdounin.ru>
-# Date 1309776931 -14400
-# Node ID e7b2f945d55ae44a2295facf9e3336dc4633e5b5
-# Parent  610e909bb9e29766188aa86fae3abe0bd3432940
-Core: fix body if it's preread and there are extra data.
-
---- nginx-1.1.15/src/http/ngx_http_request_body.c	2011-07-05 12:11:21.619264633 +0800
-+++ nginx-1.1.15-patched/src/http/ngx_http_request_body.c	2011-07-05 12:14:30.694321554 +0800
-@@ -141,6 +141,7 @@
- 
-             /* the whole request body was pre-read */
- 
-+            b->last = b->pos + r->headers_in.content_length_n;
-             r->header_in->pos += (size_t) r->headers_in.content_length_n;
-             r->request_length += r->headers_in.content_length_n;
- 

patches/nginx-1.1.15-variable_header_ignore_no_hash.patch

@@ -1,73 +0,0 @@
---- nginx-1.1.15/src/http/ngx_http_variables.c	2011-05-30 20:36:17.000000000 +0800
-+++ nginx-1.1.15-patched/src/http/ngx_http_variables.c	2011-11-08 22:21:55.229247198 +0800
-@@ -648,7 +648,17 @@
- 
-     a = (ngx_array_t *) ((char *) r + data);
- 
--    n = a->nelts;
-+    h = a->elts;
-+    n = 0;
-+
-+    for (i = 0; i < a->nelts; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-+        n++;
-+    }
- 
-     if (n == 0) {
-         v->not_found = 1;
-@@ -659,9 +669,7 @@
-     v->no_cacheable = 0;
-     v->not_found = 0;
- 
--    h = a->elts;
--
--    if (n == 1) {
-+    if (n == 1 && a->nelts == 1) {
-         v->len = (*h)->value.len;
-         v->data = (*h)->value.data;
- 
-@@ -670,7 +678,12 @@
- 
-     len = - (ssize_t) (sizeof("; ") - 1);
- 
--    for (i = 0; i < n; i++) {
-+    for (i = 0; i < a->nelts; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-         len += h[i]->value.len + sizeof("; ") - 1;
-     }
- 
-@@ -683,9 +696,14 @@
-     v->data = p;
- 
-     for (i = 0; /* void */ ; i++) {
-+
-+        if (h[i]->hash == 0) {
-+            continue;
-+        }
-+
-         p = ngx_copy(p, h[i]->value.data, h[i]->value.len);
- 
--        if (i == n - 1) {
-+        if (--n == 0) {
-             break;
-         }
- 
-@@ -738,6 +756,10 @@
-             i = 0;
-         }
- 
-+        if (header[i].hash == 0) {
-+            continue;
-+        }
-+
-         for (n = 0; n + prefix < var->len && n < header[i].key.len; n++) {
-             ch = header[i].key.data[n];
- 

patches/nginx-1.3.0-resolver_debug_log_overflow.patch

@@ -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);

util/configure

@@ -71,6 +71,7 @@ my @modules = (
     [http_array_var => 'array-var-nginx-module'],
     [http_memc => 'memc-nginx-module'],
     [http_redis2 => 'redis2-nginx-module'],
+    [http_redis => 'redis-nginx-module'],
     [http_upstream_keepalive => 'upstream-keepalive-nginx-module'],
     [http_auth_request => 'auth-request-nginx-module'],
     [http_rds_json => 'rds-json-nginx-module'],
@@ -113,6 +114,7 @@ my $dry_run;
 my @ngx_rpaths;
 my $cc;
 my $cores;
+my $luajit_xcflags = '';
 
 my (@ngx_opts, @ngx_cc_opts, @ngx_ld_opts);
 
@@ -201,6 +203,9 @@ for my $opt (@ARGV) {
     } elsif ($opt =~ /^--with-luajit=(.*)/) {
         $resty_opts{luajit_path} = $1;
 
+    } elsif ($opt =~ /^--with-luajit-xcflags=(.*)/) {
+        $luajit_xcflags .= " $1";
+
     } elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
         $resty_opts{libdrizzle} = $1;
 
@@ -510,13 +515,20 @@ _END_
         my $extra_opts = ' TARGET_STRIP=@:';
 
         if ($opts->{debug}) {
-            $extra_opts = q{ CCDEBUG=-g Q= XCFLAGS='-DLUA_USE_APICHECK}
-                .q{ -DLUA_USE_ASSERT'};
+            $luajit_xcflags .= " -DLUA_USE_APICHECK -DLUA_USE_ASSERT";
+            $luajit_xcflags =~ s/^ +//;
+            $extra_opts .= qq{ CCDEBUG=-g Q= XCFLAGS='$luajit_xcflags'};
+
+        } else {
+            if ($luajit_xcflags) {
+                $luajit_xcflags =~ s/^ +//;
+                $extra_opts .= qq{ XCFLAGS='$luajit_xcflags'};
+            }
         }
 
-        if ($platform =~ /bsd/i) {
-            $extra_opts .= ' CFLAGS=-I..';
-        }
+        #if ($platform =~ /bsd/i) {
+        #$extra_opts .= ' CFLAGS=-I..';
+        #}
 
         if ($on_solaris) {
             $extra_opts .= " INSTALL_X='$root_dir/build/install -m 0755' " .
@@ -887,6 +899,7 @@ _EOC_
   --with-lua51=PATH                  specify the external installation of Lua 5.1 by PATH
   --with-luajit                      enable and build LuaJIT 2.0
   --with-luajit=PATH                 use the external LuaJIT 2.0 installation specified by PATH
+  --with-luajit-xcflags=FLAGS        Specify extra C compiler flags for LuaJIT 2.0
   --with-libdrizzle=DIR              specify the libdrizzle 1.0 (or drizzle) installation prefix
   --with-libpq=DIR                   specify the libpq (or postgresql) installation prefix
   --with-pg_config=PATH              specify the path of the pg_config utility

util/fix-tests

@@ -37,7 +37,7 @@ for my $t_file (@t_files) {
     my $changed;
     while (<$in>) {
         for my $dir (@dirs) {
-            (my $pat = $dir) =~ s/\d.*//;
+            (my $pat = $dir) =~ s/-(\d+\..*)/-/;
             my $orig = $_;
             if (s{\.\./$pat\S+}{../$dir}g && $orig ne $_) {
                 $changed++;

util/mirror-tarballs

@@ -60,6 +60,21 @@ patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || e
 
 patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1
 
+echo applying reset_wev_handler_in_named_locations.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-reset_wev_handler_in_named_locations.patch || exit 1
+
+echo applying filter_finalize_hang.patch ...
+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
 
@@ -91,17 +106,17 @@ $root/util/get-tarball "http://github.com/simpl/ngx_devel_kit/tarball/v$ver" -O
 tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1
 mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1
 
-ver=0.22rc7
+ver=0.22rc8
 $root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/v$ver" -O set-misc-nginx-module-$ver.tar.gz || exit 1
 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.12rc8
+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
 
-ver=0.05rc1
+ver=0.05rc2
 $root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v$ver" -O rds-csv-nginx-module-$ver.tar.gz || exit 1
 tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
@@ -120,7 +135,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.5.0rc25
+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
@@ -141,7 +156,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.13rc6
+ver=0.13rc8
 $root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
 tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
 mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
@@ -184,6 +199,12 @@ mv ngx_http_auth_request_module-* auth-request-nginx-module-$ver || exit 1
 
 #################################
 
+ver=0.3.6
+$root/util/get-tarball "http://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
+tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
+mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
+
+#################################
 ver=0.9
 $root/util/get-tarball "https://github.com/FRiCKLE/ngx_postgres/tarball/$ver" -O ngx_postgres-$ver.tar.gz || exit 1
 tar -xzf ngx_postgres-$ver.tar.gz || exit 1
@@ -225,17 +246,17 @@ rm lua-makefile-fix.patch || exit 1
 
 #################################
 
-ver=2.0.0-beta9
+ver=2.0.0-beta10
 $root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
 tar -xzf LuaJIT-$ver.tar.gz || exit 1
 
-cd LuaJIT-$ver || exit 1;
-$root/util/get-tarball http://luajit.org/download/beta9_hotfix1.patch -O beta9_hotfix1.patch
-patch -p1 < beta9_hotfix1.patch || exit 1
-rm beta9_hotfix1.patch || exit 1
+#cd LuaJIT-$ver || exit 1;
+#$root/util/get-tarball http://luajit.org/download/beta9_hotfix1.patch -O beta9_hotfix1.patch
+#patch -p1 < beta9_hotfix1.patch || exit 1
+#rm beta9_hotfix1.patch || exit 1
 
-cp $root/misc/unwind-generic.h ./unwind.h || exit 1
-cd ..
+#cp $root/misc/unwind-generic.h ./unwind.h || exit 1
+#cd ..
 
 #################################
 
@@ -248,28 +269,28 @@ cd ..
 
 #################################
 
-ver=0.09rc7
+ver=0.09
 $root/util/get-tarball "http://github.com/agentzh/lua-redis-parser/tarball/v$ver" -O "lua-redis-parser-$ver.tar.gz" || exit 1
 tar -xzf lua-redis-parser-$ver.tar.gz || exit 1
 mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1
 
 #################################
 
-ver=0.04
+ver=0.05
 $root/util/get-tarball "http://github.com/agentzh/lua-rds-parser/tarball/v$ver" -O "lua-rds-parser-$ver.tar.gz" || exit 1
 tar -xzf lua-rds-parser-$ver.tar.gz || exit 1
 mv agentzh-lua-rds-parser-* lua-rds-parser-$ver || exit 1
 
 #################################
 
-ver=0.06
+ver=0.07
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-memcached/tarball/v$ver" -O "lua-resty-memcached-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-memcached-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
 
 #################################
 
-ver=0.08
+ver=0.09
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
@@ -283,14 +304,14 @@ mv agentzh-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
 
 #################################
 
-ver=0.02
+ver=0.03
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-upload/tarball/v$ver" -O "lua-resty-upload-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-upload-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-upload-* lua-resty-upload-$ver || exit 1
 
 #################################
 
-ver=0.05
+ver=0.06
 $root/util/get-tarball "http://github.com/agentzh/lua-resty-string/tarball/v$ver" -O "lua-resty-string-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-string-$ver.tar.gz || exit 1
 mv agentzh-lua-resty-string-* lua-resty-string-$ver || exit 1
@@ -303,6 +324,7 @@ cd ..
 cp $root/util/configure ./
 cp $root/README ./
 cp $root/util/install bundle/
+find bundle -name '*~' -delete
 
 cd $root
 

util/ver

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