@ -1,8 +1,7 @@
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/nginx.h nginx-1.17.4 -patched /src/core/nginx.h
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/nginx.h nginx-1.17.4 /src/core/nginx.h
--- nginx-1.17.4/src/core/nginx.h 2016-04-19 09:02:38.000000000 -0700
--- nginx-1.17.4/src/core/nginx.h 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.17.4-patched/src/core/nginx.h 2016-04-21 16:25:07.452944624 -0700
+++ nginx-1.17.4/src/core/nginx.h 2016-04-21 16:25:07.452944624 -0700
@@ -10,7 +10,7 @@
@@ -11,7 +11,7 @@
#define nginx_version 1017004
#define nginx_version 1017004
#define NGINX_VERSION "1.17.4"
#define NGINX_VERSION "1.17.4"
@ -10,9 +9,10 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/nginx.
+#define NGINX_VER "openresty/" NGINX_VERSION ".unknown (no pool)"
+#define NGINX_VER "openresty/" NGINX_VERSION ".unknown (no pool)"
#ifdef NGX_BUILD
#ifdef NGX_BUILD
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_array.c nginx-1.17.4-patched/src/core/ngx_array.c
#define NGINX_VER_BUILD NGINX_VER " (" NGX_BUILD ")"
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_array.c nginx-1.17.4/src/core/ngx_array.c
--- nginx-1.17.4/src/core/ngx_array.c 2016-04-19 09:02:38.000000000 -0700
--- nginx-1.17.4/src/core/ngx_array.c 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.17.4 -patched /src/core/ngx_array.c 2016-04-21 16:25:07.453947190 -0700
+++ nginx-1.17.4 /src/core/ngx_array.c 2016-04-21 16:25:07.453947190 -0700
@@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint
@@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint
void
void
ngx_array_destroy(ngx_array_t *a)
ngx_array_destroy(ngx_array_t *a)
@ -160,9 +160,9 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_ar
}
}
elt = (u_char *) a->elts + a->size * a->nelts;
elt = (u_char *) a->elts + a->size * a->nelts;
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_array.h nginx-1.17.4 -patched /src/core/ngx_array.h
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_array.h nginx-1.17.4 /src/core/ngx_array.h
--- nginx-1.17.4/src/core/ngx_array.h 2016-04-19 09:02:38.000000000 -0700
--- nginx-1.17.4/src/core/ngx_array.h 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.17.4 -patched /src/core/ngx_array.h 2016-04-21 16:25:07.453947190 -0700
+++ nginx-1.17.4 /src/core/ngx_array.h 2016-04-21 16:25:07.453947190 -0700
@@ -13,12 +13,23 @@
@@ -13,12 +13,23 @@
#include <ngx_core.h>
#include <ngx_core.h>
@ -195,11 +195,11 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_ar
array->elts = ngx_palloc(pool, n * size);
array->elts = ngx_palloc(pool, n * size);
if (array->elts == NULL) {
if (array->elts == NULL) {
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_palloc.c nginx-1.17.4 -patched /src/core/ngx_palloc.c
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_palloc.c nginx-1.17.4 /src/core/ngx_palloc.c
--- nginx-1.17.4/src/core/ngx_palloc.c 2016-04-19 09:02:38.000000000 -0700
--- nginx-1.17.4/src/core/ngx_palloc.c 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.17.4 -patched /src/core/ngx_palloc.c 2016-04-21 16:25:45.912282685 -0700
+++ nginx-1.17.4 /src/core/ngx_palloc.c 2016-04-21 16:25:45.912282685 -0700
@@ - 9,34 +9 ,26 @@
@@ - 10,34 +10 ,26 @@
#include <ngx_core.h>
#include <ngx_core_probe .h>
-static ngx_inline void *ngx_palloc_small(ngx_pool_t *pool, size_t size,
-static ngx_inline void *ngx_palloc_small(ngx_pool_t *pool, size_t size,
@ -237,8 +237,8 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_pa
- p->cleanup = NULL;
- p->cleanup = NULL;
p->log = log;
p->log = log;
return p ;
ngx_core_probe_create_pool_done(p, size) ;
@@ -4 6,8 +38 ,7 @@ ngx_create_pool(size_t size, ngx_log_t *
@@ -4 9,8 +41 ,7 @@ ngx_create_pool(size_t size, ngx_log_t *
void
void
ngx_destroy_pool(ngx_pool_t *pool)
ngx_destroy_pool(ngx_pool_t *pool)
{
{
@ -248,7 +248,7 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_pa
ngx_pool_cleanup_t *c;
ngx_pool_cleanup_t *c;
for (c = pool->cleanup; c; c = c->next) {
for (c = pool->cleanup; c; c = c->next) {
@@ - 58,6 +49 ,11 @@ ngx_destroy_pool(ngx_pool_t *pool)
@@ - 61,6 +52 ,11 @@ ngx_destroy_pool(ngx_pool_t *pool)
}
}
}
}
@ -260,7 +260,7 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_pa
#if (NGX_DEBUG)
#if (NGX_DEBUG)
/*
/*
@@ -6 5,13 +61 ,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
@@ -6 8,13 +64 ,9 @@ ngx_destroy_pool(ngx_pool_t *pool)
* so we cannot use this log while free()ing the pool
* so we cannot use this log while free()ing the pool
*/
*/
@ -276,7 +276,7 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_pa
if (n == NULL) {
if (n == NULL) {
break;
break;
@@ -8 0,171 +72 ,82 @@ ngx_destroy_pool(ngx_pool_t *pool)
@@ -8 3,171 +75 ,82 @@ ngx_destroy_pool(ngx_pool_t *pool)
#endif
#endif
@ -482,7 +482,7 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_pa
return p;
return p;
}
}
@@ -25 3,38 +156 ,48 @@ void *
@@ -25 6,38 +159 ,48 @@ void *
ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
{
{
void *p;
void *p;
@ -546,9 +546,9 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_pa
return NGX_OK;
return NGX_OK;
}
}
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_palloc.h nginx-1.17.4 -patched /src/core/ngx_palloc.h
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_palloc.h nginx-1.17.4 /src/core/ngx_palloc.h
--- nginx-1.17.4/src/core/ngx_palloc.h 2016-04-19 09:02:38.000000000 -0700
--- nginx-1.17.4/src/core/ngx_palloc.h 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.17.4 -patched /src/core/ngx_palloc.h 2016-04-21 16:25:07.454949755 -0700
+++ nginx-1.17.4 /src/core/ngx_palloc.h 2016-04-21 16:25:07.454949755 -0700
@@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s {
@@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s {
};
};