diff --git a/patches/nginx-1.2.4-slab_alloc_no_memory_as_info.patch b/patches/nginx-1.2.4-slab_alloc_no_memory_as_info.patch new file mode 100644 index 0000000..bb5b57e --- /dev/null +++ b/patches/nginx-1.2.4-slab_alloc_no_memory_as_info.patch @@ -0,0 +1,11 @@ +--- nginx-1.2.4/src/core/ngx_slab.c 2012-09-24 11:34:04.000000000 -0700 ++++ nginx-1.2.4-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; + } diff --git a/patches/nginx-1.2.5-slab_alloc_no_memory_as_info.patch b/patches/nginx-1.2.5-slab_alloc_no_memory_as_info.patch new file mode 100644 index 0000000..4fe227c --- /dev/null +++ b/patches/nginx-1.2.5-slab_alloc_no_memory_as_info.patch @@ -0,0 +1,11 @@ +--- nginx-1.2.5/src/core/ngx_slab.c 2012-09-24 11:34:04.000000000 -0700 ++++ nginx-1.2.5-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; + } diff --git a/patches/nginx-1.3.7-slab_alloc_no_memory_as_info.patch b/patches/nginx-1.3.7-slab_alloc_no_memory_as_info.patch new file mode 100644 index 0000000..897f42d --- /dev/null +++ b/patches/nginx-1.3.7-slab_alloc_no_memory_as_info.patch @@ -0,0 +1,11 @@ +--- nginx-1.3.7/src/core/ngx_slab.c 2012-09-24 11:34:04.000000000 -0700 ++++ nginx-1.3.7-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; + } diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 16ab4bb..4006ea1 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -125,6 +125,10 @@ echo "$info_txt applying the upstream_test_connect_kqueue patch for nginx" patch -p1 < $root/patches/nginx-$main_ver-upstream_test_connect_kqueue.patch || exit 1 echo +echo "$info_txt applying the slab_alloc_no_memory_as_info patch for nginx" +patch -p1 < $root/patches/nginx-$main_ver-slab_alloc_no_memory_as_info.patch || exit 1 +echo + rm -f *.patch || exit 1 cd .. || exit 1 diff --git a/util/ver b/util/ver index 97b97cc..3041196 100755 --- a/util/ver +++ b/util/ver @@ -3,7 +3,7 @@ #main_ver=1.3.7 #main_ver=1.2.5 main_ver=1.2.4 -minor_ver=11rc3 +minor_ver=11rc4 version=$main_ver.$minor_ver echo $version