From 5505eac72b6cac6368d00aa17d15f9d7b4d43661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?= Date: Fri, 8 Jul 2011 20:23:59 +0800 Subject: [PATCH] upgraded the nginx core to 1.0.4 and released ngx_openresty 1.0.4.0rc1. --- patches/nginx-1.0.4-no_Werror.patch | 24 +++++ patches/nginx-1.0.4-no_error_pages.patch | 90 +++++++++++++++++++ ...inx-1.0.4-request_body_in_single_buf.patch | 27 ++++++ ...nginx-1.0.4-request_body_preread_fix.patch | 17 ++++ patches/nginx-1.0.4-server_header.patch | 26 ++++++ patches/nginx-1.0.4-subrequest_loop.patch | 40 +++++++++ util/mirror-tarballs | 2 +- util/ver | 4 +- 8 files changed, 227 insertions(+), 3 deletions(-) create mode 100644 patches/nginx-1.0.4-no_Werror.patch create mode 100644 patches/nginx-1.0.4-no_error_pages.patch create mode 100644 patches/nginx-1.0.4-request_body_in_single_buf.patch create mode 100644 patches/nginx-1.0.4-request_body_preread_fix.patch create mode 100644 patches/nginx-1.0.4-server_header.patch create mode 100644 patches/nginx-1.0.4-subrequest_loop.patch diff --git a/patches/nginx-1.0.4-no_Werror.patch b/patches/nginx-1.0.4-no_Werror.patch new file mode 100644 index 0000000..977024c --- /dev/null +++ b/patches/nginx-1.0.4-no_Werror.patch @@ -0,0 +1,24 @@ +diff -ur nginx-0.8.54/auto/cc/gcc nginx-0.8.54-patched/auto/cc/gcc +--- nginx-0.8.54/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800 ++++ nginx-0.8.54-patched/auto/cc/gcc 2011-06-27 19:53:13.837741087 +0800 +@@ -169,7 +169,7 @@ + + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" +diff -ur nginx-0.8.54/auto/cc/icc nginx-0.8.54-patched/auto/cc/icc +--- nginx-0.8.54/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800 ++++ nginx-0.8.54-patched/auto/cc/icc 2011-06-27 19:53:19.508916811 +0800 +@@ -139,7 +139,7 @@ + esac + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" diff --git a/patches/nginx-1.0.4-no_error_pages.patch b/patches/nginx-1.0.4-no_error_pages.patch new file mode 100644 index 0000000..1963249 --- /dev/null +++ b/patches/nginx-1.0.4-no_error_pages.patch @@ -0,0 +1,90 @@ +--- nginx-0.8.54/src/http/ngx_http_core_module.c 2010-12-14 18:38:42.000000000 +0800 ++++ nginx-0.8.54-patched/src/http/ngx_http_core_module.c 2011-01-30 19:24:34.956354518 +0800 +@@ -57,6 +57,8 @@ + void *conf); + static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, + void *conf); ++static char *ngx_http_core_no_error_pages(ngx_conf_t *cf, ngx_command_t *cmd, ++ void *conf); + static char *ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd, + void *conf); + static char *ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, +@@ -614,6 +616,14 @@ + 0, + NULL }, + ++ { ngx_string("no_error_pages"), ++ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF ++ |NGX_CONF_NOARGS, ++ ngx_http_core_no_error_pages, ++ NGX_HTTP_LOC_CONF_OFFSET, ++ 0, ++ NULL }, ++ + { ngx_string("try_files"), + NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE, + ngx_http_core_try_files, +@@ -3052,7 +3062,6 @@ + * clcf->types = NULL; + * clcf->default_type = { 0, NULL }; + * clcf->error_log = NULL; +- * clcf->error_pages = NULL; + * clcf->try_files = NULL; + * clcf->client_body_path = NULL; + * clcf->regex = NULL; +@@ -3062,6 +3071,7 @@ + * clcf->gzip_proxied = 0; + */ + ++ clcf->error_pages = NGX_CONF_UNSET_PTR; + clcf->client_max_body_size = NGX_CONF_UNSET; + clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE; + clcf->client_body_timeout = NGX_CONF_UNSET_MSEC; +@@ -3250,9 +3260,7 @@ + } + } + +- if (conf->error_pages == NULL && prev->error_pages) { +- conf->error_pages = prev->error_pages; +- } ++ ngx_conf_merge_ptr_value(conf->error_pages, prev->error_pages, NULL); + + ngx_conf_merge_str_value(conf->default_type, + prev->default_type, "text/plain"); +@@ -3988,6 +3996,10 @@ + ngx_http_compile_complex_value_t ccv; + + if (clcf->error_pages == NULL) { ++ return "conflicts with \"no_error_pages\""; ++ } ++ ++ if (clcf->error_pages == NGX_CONF_UNSET_PTR) { + clcf->error_pages = ngx_array_create(cf->pool, 4, + sizeof(ngx_http_err_page_t)); + if (clcf->error_pages == NULL) { +@@ -4095,6 +4107,25 @@ + + + static char * ++ngx_http_core_no_error_pages(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ++{ ++ ngx_http_core_loc_conf_t *clcf = conf; ++ ++ if (clcf->error_pages == NULL) { ++ return "is duplicate"; ++ } ++ ++ if (clcf->error_pages != NGX_CONF_UNSET_PTR) { ++ return "conflicts with \"error_page\""; ++ } ++ ++ clcf->error_pages = NULL; ++ ++ return NGX_CONF_OK; ++} ++ ++ ++static char * + ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + { + ngx_http_core_loc_conf_t *clcf = conf; diff --git a/patches/nginx-1.0.4-request_body_in_single_buf.patch b/patches/nginx-1.0.4-request_body_in_single_buf.patch new file mode 100644 index 0000000..7d50d73 --- /dev/null +++ b/patches/nginx-1.0.4-request_body_in_single_buf.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User Maxim Dounin +# 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; + } + diff --git a/patches/nginx-1.0.4-request_body_preread_fix.patch b/patches/nginx-1.0.4-request_body_preread_fix.patch new file mode 100644 index 0000000..f98b323 --- /dev/null +++ b/patches/nginx-1.0.4-request_body_preread_fix.patch @@ -0,0 +1,17 @@ +# HG changeset patch +# User Maxim Dounin +# Date 1309776931 -14400 +# Node ID e7b2f945d55ae44a2295facf9e3336dc4633e5b5 +# Parent 610e909bb9e29766188aa86fae3abe0bd3432940 +Core: fix body if it's preread and there are extra data. + +--- nginx-0.8.54/src/http/ngx_http_request_body.c 2011-07-05 12:11:21.619264633 +0800 ++++ nginx-0.8.54-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; + diff --git a/patches/nginx-1.0.4-server_header.patch b/patches/nginx-1.0.4-server_header.patch new file mode 100644 index 0000000..c331a4e --- /dev/null +++ b/patches/nginx-1.0.4-server_header.patch @@ -0,0 +1,26 @@ +diff -ur lz-nginx-1.0.4/nginx-1.0.4/src/core/nginx.h lz-nginx-1.0.4-patched/nginx-1.0.4/src/core/nginx.h +--- lz-nginx-1.0.4/nginx-1.0.4/src/core/nginx.h 2010-02-12 17:31:01.000000000 +0800 ++++ lz-nginx-1.0.4-patched/nginx-1.0.4/src/core/nginx.h 2010-03-30 10:52:13.240702627 +0800 +@@ -10,7 +10,7 @@ + + #define nginx_version 1000004 + #define NGINX_VERSION "1.0.4" +-#define NGINX_VER "nginx/" NGINX_VERSION ++#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown" + + #define NGINX_VAR "NGINX" + #define NGX_OLDPID_EXT ".oldbin" +Only in lz-nginx-1.0.4-patched/nginx-1.0.4/src/core: nginx.h.orig +Only in lz-nginx-1.0.4-patched/nginx-1.0.4/src/core: nginx.h.rej +diff -ur lz-nginx-1.0.4/nginx-1.0.4/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.4-patched/nginx-1.0.4/src/http/ngx_http_header_filter_module.c +--- lz-nginx-1.0.4/nginx-1.0.4/src/http/ngx_http_header_filter_module.c 2010-03-03 23:14:04.000000000 +0800 ++++ lz-nginx-1.0.4-patched/nginx-1.0.4/src/http/ngx_http_header_filter_module.c 2010-03-30 10:52:53.670909405 +0800 +@@ -45,7 +45,7 @@ + }; + + +-static char ngx_http_server_string[] = "Server: nginx" CRLF; ++static char ngx_http_server_string[] = "Server: ngx_openresty" CRLF; + static char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF; + + diff --git a/patches/nginx-1.0.4-subrequest_loop.patch b/patches/nginx-1.0.4-subrequest_loop.patch new file mode 100644 index 0000000..0b9ca69 --- /dev/null +++ b/patches/nginx-1.0.4-subrequest_loop.patch @@ -0,0 +1,40 @@ +# HG changeset patch +# User Maxim Dounin +# Date 1309187571 -14400 +# Node ID 283a416b2235d5383c12a975edc8866f007fb628 +# Parent f5fc40783ddcbf4db33859ee2a9bce54cf32c350 +Core: protect from subrequest loops. + +Without protection subrequest loop results in r->count overflow and +SIGSEGV. Protection was broken in 0.7.25. + +Note that this also limits number of parallel subrequests. This +wasn't exactly the case before 0.7.25 as local subrequests were +completed directly. + +See here for details: + +http://nginx.org/pipermail/nginx-ru/2010-February/032184.html + +diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c +--- a/src/http/ngx_http_core_module.c ++++ b/src/http/ngx_http_core_module.c +@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t * + sr->start_sec = tp->sec; + sr->start_msec = tp->msec; + +- r->main->subrequests++; + r->main->count++; + + *psr = sr; +diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c +--- a/src/http/ngx_http_request.c ++++ b/src/http/ngx_http_request.c +@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque + if (r == c->data) { + + r->main->count--; ++ r->main->subrequests++; + + if (!r->logged) { + diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 242edcc..51a62a7 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -32,7 +32,7 @@ sed -i $"s/NGINX_VERSION \".unknown\"/NGINX_VERSION \".$minor_ver\"/" \ patch -p2 < server_header.patch || exit 1 -patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit 1 +#patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit 1 patch -p1 < $root/patches/nginx-$main_ver-no_error_pages.patch || exit 1 diff --git a/util/ver b/util/ver index 6f8fa1c..941ec3c 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash -main_ver=0.8.54 -minor_ver=9 +main_ver=1.0.4 +minor_ver=0rc1 version=$main_ver.$minor_ver echo $version