186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

checked in the patches for nginx 1.5.3; also applied the unix_socket_accept_over_read patch the nginx cores older than 1.5.3.

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2013-08-30 12:41:13 -07:00
parent c36f990f10
commit 921fd6d675
14 changed files with 2145 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/nginx-1.5.3-slab_alloc_no_memory_as_info.patch Normal file
View File

@ -0,0 +1,11 @@
--- nginx-1.5.3/src/core/ngx_slab.c 2012-09-24 11:34:04.000000000 -0700
+++ nginx-1.5.3-patched/src/core/ngx_slab.c 2012-12-05 20:47:07.296694952 -0800
@@ -657,7 +657,7 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *po
}
}
- ngx_slab_error(pool, NGX_LOG_CRIT, "ngx_slab_alloc() failed: no memory");
+ ngx_slab_error(pool, NGX_LOG_INFO, "ngx_slab_alloc() failed: no memory");
return NULL;
}