flyskype
/
openresty
mirror of https://github.com/openresty/openresty
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update no_pool.patch refer to openresty/openresty@f17fe6e

Browse Source 
upgrade `Test 72: --with-no-pool-patch` as of the recent changes
pull/560/head
James ZHANG 6 years ago
parent 775ad5ef2c
commit 513c7f14ac
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

16
patches/nginx-1.17.4-no_pool.patch
Unescape Escape View File

@ -198,8 +198,8 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_ar
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.17.4/src/core/ngx_palloc.c nginx-1.17.4/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/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
@@ -10,34 +10,26 @@ @@ -9,34 +9,26 @@
#include <ngx_core_probe.h> #include <ngx_core.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;
ngx_core_probe_create_pool_done(p, size); return p;
@@ -49,8 +41,7 @@ ngx_create_pool(size_t size, ngx_log_t * @@ -46,8 +38,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) {
@@ -61,6 +52,11 @@ ngx_destroy_pool(ngx_pool_t *pool) @@ -58,6 +49,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)
/* /*
@@ -68,13 +64,9 @@ ngx_destroy_pool(ngx_pool_t *pool) @@ -65,13 +61,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;
@@ -83,171 +75,82 @@ ngx_destroy_pool(ngx_pool_t *pool) @@ -80,171 +72,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;
} }
@@ -256,38 +159,48 @@ void * @@ -253,38 +156,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;

10
t/000-sanity.t
Unescape Escape View File

@ -5896,7 +5896,7 @@ patching file nginx-1.17.4/src/core/ngx_array.c
patching file nginx-1.17.4/src/core/ngx_array.h patching file nginx-1.17.4/src/core/ngx_array.h
patching file nginx-1.17.4/src/core/ngx_palloc.c patching file nginx-1.17.4/src/core/ngx_palloc.c
patching file nginx-1.17.4/src/core/ngx_palloc.h patching file nginx-1.17.4/src/core/ngx_palloc.h
cd LuaJIT-2.1-20190912 cd LuaJIT-2.1-20200102
INFO: found -msse4.2 in cc. INFO: found -msse4.2 in cc.
gmake TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit gmake TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit
gmake install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root/ gmake install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root/
@ -5908,13 +5908,13 @@ cd nginx-1.17.4
sh ./configure --prefix=/usr/local/openresty/nginx \ sh ./configure --prefix=/usr/local/openresty/nginx \
--with-cc-opt='-O2' \ --with-cc-opt='-O2' \
--add-module=../ngx_devel_kit-0.3.1rc1 \ --add-module=../ngx_devel_kit-0.3.1rc1 \
--add-module=../echo-nginx-module-0.61 \ --add-module=../echo-nginx-module-0.62rc1 \
--add-module=../xss-nginx-module-0.06 \ --add-module=../xss-nginx-module-0.06 \
--add-module=../ngx_coolkit-0.2 \ --add-module=../ngx_coolkit-0.2 \
--add-module=../set-misc-nginx-module-0.32 \ --add-module=../set-misc-nginx-module-0.32 \
--add-module=../form-input-nginx-module-0.12 \ --add-module=../form-input-nginx-module-0.12 \
--add-module=../encrypted-session-nginx-module-0.08 \ --add-module=../encrypted-session-nginx-module-0.08 \
--add-module=../srcache-nginx-module-0.31 \ --add-module=../srcache-nginx-module-0.32rc1 \
--add-module=../ngx_lua-0.10.15 \ --add-module=../ngx_lua-0.10.15 \
--add-module=../ngx_lua_upstream-0.07 \ --add-module=../ngx_lua_upstream-0.07 \
--add-module=../headers-more-nginx-module-0.33 \ --add-module=../headers-more-nginx-module-0.33 \
@ -5936,7 +5936,7 @@ Type the following commands to build and install:
.PHONY: all install clean .PHONY: all install clean
all: all:
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.1-20190912 && $(MAKE) TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit cd $OPENRESTY_BUILD_DIR/LuaJIT-2.1-20200102 && $(MAKE) TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit
cd $OPENRESTY_BUILD_DIR/lua-cjson-2.1.0.7 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_CMODULE_DIR=/usr/local/openresty/lualib LUA_MODULE_DIR=/usr/local/openresty/lualib CJSON_CFLAGS="-g -fpic" CC=cc cd $OPENRESTY_BUILD_DIR/lua-cjson-2.1.0.7 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_CMODULE_DIR=/usr/local/openresty/lualib LUA_MODULE_DIR=/usr/local/openresty/lualib CJSON_CFLAGS="-g -fpic" CC=cc
cd $OPENRESTY_BUILD_DIR/lua-resty-signal-0.02 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_LIB_DIR=/usr/local/openresty/lualib CC=cc cd $OPENRESTY_BUILD_DIR/lua-resty-signal-0.02 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_LIB_DIR=/usr/local/openresty/lualib CC=cc
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.13 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_LIB_DIR=/usr/local/openresty/lualib CC=cc cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.13 && $(MAKE) DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_LIB_DIR=/usr/local/openresty/lualib CC=cc
@ -5946,7 +5946,7 @@ all:
install: all install: all
mkdir -p $(DESTDIR)/usr/local/openresty/ mkdir -p $(DESTDIR)/usr/local/openresty/
-cp $OPENRESTY_DIR/COPYRIGHT $(DESTDIR)/usr/local/openresty/ -cp $OPENRESTY_DIR/COPYRIGHT $(DESTDIR)/usr/local/openresty/
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.1-20190912 && $(MAKE) install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) cd $OPENRESTY_BUILD_DIR/LuaJIT-2.1-20200102 && $(MAKE) install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
cd $OPENRESTY_BUILD_DIR/lua-cjson-2.1.0.7 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_CMODULE_DIR=/usr/local/openresty/lualib LUA_MODULE_DIR=/usr/local/openresty/lualib CJSON_CFLAGS="-g -fpic" CC=cc cd $OPENRESTY_BUILD_DIR/lua-cjson-2.1.0.7 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_CMODULE_DIR=/usr/local/openresty/lualib LUA_MODULE_DIR=/usr/local/openresty/lualib CJSON_CFLAGS="-g -fpic" CC=cc
cd $OPENRESTY_BUILD_DIR/lua-resty-signal-0.02 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_LIB_DIR=/usr/local/openresty/lualib CC=cc cd $OPENRESTY_BUILD_DIR/lua-resty-signal-0.02 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_LIB_DIR=/usr/local/openresty/lualib CC=cc
cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.13 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_LIB_DIR=/usr/local/openresty/lualib CC=cc cd $OPENRESTY_BUILD_DIR/lua-redis-parser-0.13 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_INCLUDE_DIR=$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1 LUA_LIB_DIR=/usr/local/openresty/lualib CC=cc

Write Preview
Loading…
Cancel
Save