mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
42 Commits
v1.0.11.25
...
v1.1.13.1
Author | SHA1 | Date | |
---|---|---|---|
d1bc0aafaa | |||
8ccb6abbb2 | |||
fd80fa22ef | |||
2bffe13e20 | |||
92e0dd7abf | |||
86af3896ba | |||
065bf15551 | |||
d9782b738d | |||
5abfef061a | |||
7ce68bd980 | |||
cbb2c2f247 | |||
e96bacd8fd | |||
8479638467 | |||
880010cf91 | |||
111c045db9 | |||
fc61696e25 | |||
1982776375 | |||
53499aeca1 | |||
b2b220e332 | |||
fea60f101b | |||
eb48103b54 | |||
3c74f263bc | |||
f54c295fd8 | |||
8eb28a55d3 | |||
bf26312dc0 | |||
e48b3196fe | |||
39a5983eef | |||
71c3005938 | |||
54ed6f5afd | |||
5dfca9ea1f | |||
ef57a37301 | |||
fd858205d3 | |||
480a7a2e49 | |||
6fbf4031fb | |||
2bf6bb8a20 | |||
8f9e508c20 | |||
36cd84e64c | |||
cf199f5274 | |||
0c3a564c8e | |||
afd4039007 | |||
4619fbf426 | |||
237638cdfc |
@ -1,14 +0,0 @@
|
|||||||
--- nginx-1.0.11/src/http/ngx_http_request.h 2011-08-29 18:39:23.000000000 +0800
|
|
||||||
+++ nginx-1.0.11-patched/src/http/ngx_http_request.h 2012-02-20 15:50:43.540762756 +0800
|
|
||||||
@@ -9,7 +9,10 @@
|
|
||||||
|
|
||||||
|
|
||||||
#define NGX_HTTP_MAX_URI_CHANGES 10
|
|
||||||
-#define NGX_HTTP_MAX_SUBREQUESTS 50
|
|
||||||
+
|
|
||||||
+#ifndef NGX_HTTP_MAX_SUBREQUESTS
|
|
||||||
+#define NGX_HTTP_MAX_SUBREQUESTS 200
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* must be 2^n */
|
|
||||||
#define NGX_HTTP_LC_HEADER_LEN 32
|
|
@ -1,113 +0,0 @@
|
|||||||
--- src/http/modules/ngx_http_fastcgi_module.c
|
|
||||||
+++ src/http/modules/ngx_http_fastcgi_module.c
|
|
||||||
@@ -1501,10 +1501,10 @@ ngx_http_fastcgi_process_header(ngx_http
|
|
||||||
h->lowcase_key = h->key.data + h->key.len + 1
|
|
||||||
+ h->value.len + 1;
|
|
||||||
|
|
||||||
- ngx_cpystrn(h->key.data, r->header_name_start,
|
|
||||||
- h->key.len + 1);
|
|
||||||
- ngx_cpystrn(h->value.data, r->header_start,
|
|
||||||
- h->value.len + 1);
|
|
||||||
+ ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
|
|
||||||
+ h->key.data[h->key.len] = '\0';
|
|
||||||
+ ngx_memcpy(h->value.data, r->header_start, h->value.len);
|
|
||||||
+ h->value.data[h->value.len] = '\0';
|
|
||||||
}
|
|
||||||
|
|
||||||
h->hash = r->header_hash;
|
|
||||||
--- src/http/modules/ngx_http_proxy_module.c
|
|
||||||
+++ src/http/modules/ngx_http_proxy_module.c
|
|
||||||
@@ -1381,8 +1381,10 @@ ngx_http_proxy_process_header(ngx_http_r
|
|
||||||
h->value.data = h->key.data + h->key.len + 1;
|
|
||||||
h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
|
|
||||||
|
|
||||||
- ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
|
|
||||||
- ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
|
|
||||||
+ ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
|
|
||||||
+ h->key.data[h->key.len] = '\0';
|
|
||||||
+ ngx_memcpy(h->value.data, r->header_start, h->value.len);
|
|
||||||
+ h->value.data[h->value.len] = '\0';
|
|
||||||
|
|
||||||
if (h->key.len == r->lowcase_index) {
|
|
||||||
ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
|
|
||||||
--- src/http/modules/ngx_http_scgi_module.c
|
|
||||||
+++ src/http/modules/ngx_http_scgi_module.c
|
|
||||||
@@ -941,8 +941,10 @@ ngx_http_scgi_process_header(ngx_http_re
|
|
||||||
h->value.data = h->key.data + h->key.len + 1;
|
|
||||||
h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
|
|
||||||
|
|
||||||
- ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
|
|
||||||
- ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
|
|
||||||
+ ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
|
|
||||||
+ h->key.data[h->key.len] = '\0';
|
|
||||||
+ ngx_memcpy(h->value.data, r->header_start, h->value.len);
|
|
||||||
+ h->value.data[h->value.len] = '\0';
|
|
||||||
|
|
||||||
if (h->key.len == r->lowcase_index) {
|
|
||||||
ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
|
|
||||||
--- src/http/modules/ngx_http_uwsgi_module.c
|
|
||||||
+++ src/http/modules/ngx_http_uwsgi_module.c
|
|
||||||
@@ -985,8 +985,10 @@ ngx_http_uwsgi_process_header(ngx_http_r
|
|
||||||
h->value.data = h->key.data + h->key.len + 1;
|
|
||||||
h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
|
|
||||||
|
|
||||||
- ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
|
|
||||||
- ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
|
|
||||||
+ ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
|
|
||||||
+ h->key.data[h->key.len] = '\0';
|
|
||||||
+ ngx_memcpy(h->value.data, r->header_start, h->value.len);
|
|
||||||
+ h->value.data[h->value.len] = '\0';
|
|
||||||
|
|
||||||
if (h->key.len == r->lowcase_index) {
|
|
||||||
ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
|
|
||||||
--- src/http/ngx_http_parse.c
|
|
||||||
+++ src/http/ngx_http_parse.c
|
|
||||||
@@ -874,6 +874,10 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (ch == '\0') {
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
r->invalid_header = 1;
|
|
||||||
|
|
||||||
break;
|
|
||||||
@@ -936,6 +940,10 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (ch == '\0') {
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
r->invalid_header = 1;
|
|
||||||
|
|
||||||
break;
|
|
||||||
@@ -954,6 +962,8 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
r->header_start = p;
|
|
||||||
r->header_end = p;
|
|
||||||
goto done;
|
|
||||||
+ case '\0':
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
default:
|
|
||||||
r->header_start = p;
|
|
||||||
state = sw_value;
|
|
||||||
@@ -975,6 +985,8 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
case LF:
|
|
||||||
r->header_end = p;
|
|
||||||
goto done;
|
|
||||||
+ case '\0':
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
@@ -988,6 +1000,8 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
break;
|
|
||||||
case LF:
|
|
||||||
goto done;
|
|
||||||
+ case '\0':
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
default:
|
|
||||||
state = sw_value;
|
|
||||||
break;
|
|
@ -1,14 +0,0 @@
|
|||||||
--- nginx-1.0.12/src/http/ngx_http_request.h 2011-08-29 18:39:23.000000000 +0800
|
|
||||||
+++ nginx-1.0.12-patched/src/http/ngx_http_request.h 2012-02-20 15:50:43.540762756 +0800
|
|
||||||
@@ -9,7 +9,10 @@
|
|
||||||
|
|
||||||
|
|
||||||
#define NGX_HTTP_MAX_URI_CHANGES 10
|
|
||||||
-#define NGX_HTTP_MAX_SUBREQUESTS 50
|
|
||||||
+
|
|
||||||
+#ifndef NGX_HTTP_MAX_SUBREQUESTS
|
|
||||||
+#define NGX_HTTP_MAX_SUBREQUESTS 200
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* must be 2^n */
|
|
||||||
#define NGX_HTTP_LC_HEADER_LEN 32
|
|
@ -1,24 +0,0 @@
|
|||||||
diff -ur nginx-1.0.12/auto/cc/gcc nginx-1.0.12-patched/auto/cc/gcc
|
|
||||||
--- nginx-1.0.12/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800
|
|
||||||
+++ nginx-1.0.12-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-1.0.12/auto/cc/icc nginx-1.0.12-patched/auto/cc/icc
|
|
||||||
--- nginx-1.0.12/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800
|
|
||||||
+++ nginx-1.0.12-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"
|
|
@ -1,26 +0,0 @@
|
|||||||
diff -ur lz-nginx-1.0.12/nginx-1.0.12/src/core/nginx.h lz-nginx-1.0.12-patched/nginx-1.0.12/src/core/nginx.h
|
|
||||||
--- lz-nginx-1.0.12/nginx-1.0.12/src/core/nginx.h 2010-02-12 17:31:01.000000000 +0800
|
|
||||||
+++ lz-nginx-1.0.12-patched/nginx-1.0.12/src/core/nginx.h 2010-03-30 10:52:13.240702627 +0800
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
|
|
||||||
#define nginx_version 1000012
|
|
||||||
#define NGINX_VERSION "1.0.12"
|
|
||||||
-#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.12-patched/nginx-1.0.12/src/core: nginx.h.orig
|
|
||||||
Only in lz-nginx-1.0.12-patched/nginx-1.0.12/src/core: nginx.h.rej
|
|
||||||
diff -ur lz-nginx-1.0.12/nginx-1.0.12/src/http/ngx_http_header_filter_module.c lz-nginx-1.0.12-patched/nginx-1.0.12/src/http/ngx_http_header_filter_module.c
|
|
||||||
--- lz-nginx-1.0.12/nginx-1.0.12/src/http/ngx_http_header_filter_module.c 2010-03-03 23:14:04.000000000 +0800
|
|
||||||
+++ lz-nginx-1.0.12-patched/nginx-1.0.12/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;
|
|
||||||
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
diff -ur nginx-1.0.12/src/http/ngx_http_request_body.c nginx-1.0.12-patched/src/http/ngx_http_request_body.c
|
diff -ur nginx-1.1.12/src/http/ngx_http_request_body.c nginx-1.1.12-patched/src/http/ngx_http_request_body.c
|
||||||
--- nginx-1.0.12/src/http/ngx_http_request_body.c 2011-09-30 22:36:19.000000000 +0800
|
--- nginx-1.1.12/src/http/ngx_http_request_body.c 2011-09-30 22:36:19.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/http/ngx_http_request_body.c 2011-10-21 21:54:08.460350482 +0800
|
+++ nginx-1.1.12-patched/src/http/ngx_http_request_body.c 2011-10-21 21:54:08.460350482 +0800
|
||||||
@@ -38,7 +38,7 @@
|
@@ -38,7 +38,7 @@
|
||||||
|
|
||||||
r->main->count++;
|
r->main->count++;
|
||||||
@ -77,10 +77,10 @@ diff -ur nginx-1.0.12/src/http/ngx_http_request_body.c nginx-1.0.12-patched/src/
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Only in nginx-1.0.12-patched/src/http: ngx_http_request_body.c~
|
Only in nginx-1.1.12-patched/src/http: ngx_http_request_body.c~
|
||||||
diff -ur nginx-1.0.12/src/http/ngx_http_request.c nginx-1.0.12-patched/src/http/ngx_http_request.c
|
diff -ur nginx-1.1.12/src/http/ngx_http_request.c nginx-1.1.12-patched/src/http/ngx_http_request.c
|
||||||
--- nginx-1.0.12/src/http/ngx_http_request.c 2011-09-30 22:36:19.000000000 +0800
|
--- nginx-1.1.12/src/http/ngx_http_request.c 2011-09-30 22:36:19.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/http/ngx_http_request.c 2011-10-21 19:06:38.404350692 +0800
|
+++ nginx-1.1.12-patched/src/http/ngx_http_request.c 2011-10-21 19:06:38.404350692 +0800
|
||||||
@@ -286,6 +286,8 @@
|
@@ -286,6 +286,8 @@
|
||||||
|
|
||||||
r->pipeline = hc->pipeline;
|
r->pipeline = hc->pipeline;
|
||||||
@ -99,10 +99,10 @@ diff -ur nginx-1.0.12/src/http/ngx_http_request.c nginx-1.0.12-patched/src/http/
|
|||||||
hc->request = r;
|
hc->request = r;
|
||||||
}
|
}
|
||||||
|
|
||||||
Only in nginx-1.0.12-patched/src/http: ngx_http_request.c~
|
Only in nginx-1.1.12-patched/src/http: ngx_http_request.c~
|
||||||
diff -ur nginx-1.0.12/src/http/ngx_http_request.h nginx-1.0.12-patched/src/http/ngx_http_request.h
|
diff -ur nginx-1.1.12/src/http/ngx_http_request.h nginx-1.1.12-patched/src/http/ngx_http_request.h
|
||||||
--- nginx-1.0.12/src/http/ngx_http_request.h 2011-08-29 18:39:23.000000000 +0800
|
--- nginx-1.1.12/src/http/ngx_http_request.h 2011-08-29 18:39:23.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/http/ngx_http_request.h 2011-10-21 17:26:13.203807584 +0800
|
+++ nginx-1.1.12-patched/src/http/ngx_http_request.h 2011-10-21 17:26:13.203807584 +0800
|
||||||
@@ -366,6 +366,9 @@
|
@@ -366,6 +366,9 @@
|
||||||
ngx_pool_t *pool;
|
ngx_pool_t *pool;
|
||||||
ngx_buf_t *header_in;
|
ngx_buf_t *header_in;
|
||||||
@ -113,5 +113,5 @@ diff -ur nginx-1.0.12/src/http/ngx_http_request.h nginx-1.0.12-patched/src/http/
|
|||||||
ngx_http_headers_in_t headers_in;
|
ngx_http_headers_in_t headers_in;
|
||||||
ngx_http_headers_out_t headers_out;
|
ngx_http_headers_out_t headers_out;
|
||||||
|
|
||||||
Only in nginx-1.0.12-patched/src/http: ngx_http_request.h~
|
Only in nginx-1.1.12-patched/src/http: ngx_http_request.h~
|
||||||
Only in nginx-1.0.12-patched/src/http: tags
|
Only in nginx-1.1.12-patched/src/http: tags
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.1.15/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800
|
--- nginx-1.1.12/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/event/modules/ngx_epoll_module.c 2011-11-30 11:08:46.775817019 +0800
|
+++ nginx-1.1.12-patched/src/event/modules/ngx_epoll_module.c 2011-11-30 11:08:46.775817019 +0800
|
||||||
@@ -682,6 +682,17 @@
|
@@ -682,6 +682,17 @@
|
||||||
wev = c->write;
|
wev = c->write;
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.0.12/src/http/modules/ngx_http_log_module.c 2011-11-01 21:24:50.000000000 +0800
|
--- nginx-1.1.12/src/http/modules/ngx_http_log_module.c 2011-11-01 21:24:50.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/http/modules/ngx_http_log_module.c 2011-11-10 16:17:29.599039534 +0800
|
+++ nginx-1.1.12-patched/src/http/modules/ngx_http_log_module.c 2011-11-10 16:17:29.599039534 +0800
|
||||||
@@ -61,6 +61,8 @@
|
@@ -61,6 +61,8 @@
|
||||||
time_t open_file_cache_valid;
|
time_t open_file_cache_valid;
|
||||||
ngx_uint_t open_file_cache_min_uses;
|
ngx_uint_t open_file_cache_min_uses;
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.0.12/src/http/ngx_http_core_module.c 2011-09-27 19:14:02.000000000 +0800
|
--- nginx-1.1.12/src/http/ngx_http_core_module.c 2011-09-27 19:14:02.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/http/ngx_http_core_module.c 2011-10-13 15:02:24.414550532 +0800
|
+++ nginx-1.1.12-patched/src/http/ngx_http_core_module.c 2011-10-13 15:02:24.414550532 +0800
|
||||||
@@ -2542,6 +2542,9 @@
|
@@ -2542,6 +2542,9 @@
|
||||||
r->content_handler = NULL;
|
r->content_handler = NULL;
|
||||||
r->loc_conf = (*clcfp)->loc_conf;
|
r->loc_conf = (*clcfp)->loc_conf;
|
24
patches/nginx-1.1.12-no_Werror.patch
Normal file
24
patches/nginx-1.1.12-no_Werror.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -ur nginx-1.1.12/auto/cc/gcc nginx-1.1.12-patched/auto/cc/gcc
|
||||||
|
--- nginx-1.1.12/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800
|
||||||
|
+++ nginx-1.1.12-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-1.1.12/auto/cc/icc nginx-1.1.12-patched/auto/cc/icc
|
||||||
|
--- nginx-1.1.12/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800
|
||||||
|
+++ nginx-1.1.12-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"
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.1.15/src/http/ngx_http_core_module.c 2010-12-14 18:38:42.000000000 +0800
|
--- nginx-1.1.12/src/http/ngx_http_core_module.c 2010-12-14 18:38:42.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/http/ngx_http_core_module.c 2011-01-30 19:24:34.956354518 +0800
|
+++ nginx-1.1.12-patched/src/http/ngx_http_core_module.c 2011-01-30 19:24:34.956354518 +0800
|
||||||
@@ -57,6 +57,8 @@
|
@@ -57,6 +57,8 @@
|
||||||
void *conf);
|
void *conf);
|
||||||
static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd,
|
static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd,
|
@ -1,18 +1,18 @@
|
|||||||
diff -ur nginx-1.0.12/src/core/nginx.h nginx-1.0.12-patched/src/core/nginx.h
|
diff -ur nginx-1.1.12/src/core/nginx.h nginx-1.1.12-patched/src/core/nginx.h
|
||||||
--- nginx-1.0.12/src/core/nginx.h 2011-08-29 17:30:22.000000000 +0800
|
--- nginx-1.1.12/src/core/nginx.h 2011-08-29 17:30:22.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/core/nginx.h 2011-09-13 12:11:03.135622101 +0800
|
+++ nginx-1.1.12-patched/src/core/nginx.h 2011-09-13 12:11:03.135622101 +0800
|
||||||
@@ -10,7 +10,7 @@
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
|
||||||
#define nginx_version 1000012
|
#define nginx_version 1001012
|
||||||
#define NGINX_VERSION "1.0.12"
|
#define NGINX_VERSION "1.1.12"
|
||||||
-#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown"
|
-#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown"
|
||||||
+#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
|
+#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
|
||||||
|
|
||||||
#define NGINX_VAR "NGINX"
|
#define NGINX_VAR "NGINX"
|
||||||
diff -ur nginx-1.0.12/src/core/ngx_array.c nginx-1.0.12-patched/src/core/ngx_array.c
|
diff -ur nginx-1.1.12/src/core/ngx_array.c nginx-1.1.12-patched/src/core/ngx_array.c
|
||||||
--- nginx-1.0.12/src/core/ngx_array.c 2008-06-17 23:00:30.000000000 +0800
|
--- nginx-1.1.12/src/core/ngx_array.c 2008-06-17 23:00:30.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/core/ngx_array.c 2011-09-14 12:02:56.263128538 +0800
|
+++ nginx-1.1.12-patched/src/core/ngx_array.c 2011-09-14 12:02:56.263128538 +0800
|
||||||
@@ -39,13 +39,7 @@
|
@@ -39,13 +39,7 @@
|
||||||
|
|
||||||
p = a->pool;
|
p = a->pool;
|
||||||
@ -121,9 +121,9 @@ diff -ur nginx-1.0.12/src/core/ngx_array.c nginx-1.0.12-patched/src/core/ngx_arr
|
|||||||
}
|
}
|
||||||
|
|
||||||
elt = (u_char *) a->elts + a->size * a->nelts;
|
elt = (u_char *) a->elts + a->size * a->nelts;
|
||||||
diff -ur nginx-1.0.12/src/core/ngx_palloc.c nginx-1.0.12-patched/src/core/ngx_palloc.c
|
diff -ur nginx-1.1.12/src/core/ngx_palloc.c nginx-1.1.12-patched/src/core/ngx_palloc.c
|
||||||
--- nginx-1.0.12/src/core/ngx_palloc.c 2009-12-17 20:25:46.000000000 +0800
|
--- nginx-1.1.12/src/core/ngx_palloc.c 2009-12-17 20:25:46.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/core/ngx_palloc.c 2011-09-14 12:03:41.663126519 +0800
|
+++ nginx-1.1.12-patched/src/core/ngx_palloc.c 2011-09-14 12:03:41.663126519 +0800
|
||||||
@@ -8,24 +8,31 @@
|
@@ -8,24 +8,31 @@
|
||||||
#include <ngx_core.h>
|
#include <ngx_core.h>
|
||||||
|
|
||||||
@ -468,9 +468,9 @@ diff -ur nginx-1.0.12/src/core/ngx_palloc.c nginx-1.0.12-patched/src/core/ngx_pa
|
|||||||
}
|
}
|
||||||
|
|
||||||
return NGX_DECLINED;
|
return NGX_DECLINED;
|
||||||
diff -ur nginx-1.0.12/src/core/ngx_palloc.h nginx-1.0.12-patched/src/core/ngx_palloc.h
|
diff -ur nginx-1.1.12/src/core/ngx_palloc.h nginx-1.1.12-patched/src/core/ngx_palloc.h
|
||||||
--- nginx-1.0.12/src/core/ngx_palloc.h 2009-12-17 20:25:46.000000000 +0800
|
--- nginx-1.1.12/src/core/ngx_palloc.h 2009-12-17 20:25:46.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/core/ngx_palloc.h 2011-09-13 12:11:03.155622101 +0800
|
+++ nginx-1.1.12-patched/src/core/ngx_palloc.h 2011-09-13 12:11:03.155622101 +0800
|
||||||
@@ -38,6 +38,7 @@
|
@@ -38,6 +38,7 @@
|
||||||
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
|||||||
# Parent 610e909bb9e29766188aa86fae3abe0bd3432940
|
# Parent 610e909bb9e29766188aa86fae3abe0bd3432940
|
||||||
Core: fix body if it's preread and there are extra data.
|
Core: fix body if it's preread and there are extra data.
|
||||||
|
|
||||||
--- nginx-1.1.15/src/http/ngx_http_request_body.c 2011-07-05 12:11:21.619264633 +0800
|
--- nginx-1.1.12/src/http/ngx_http_request_body.c 2011-07-05 12:11:21.619264633 +0800
|
||||||
+++ nginx-1.1.15-patched/src/http/ngx_http_request_body.c 2011-07-05 12:14:30.694321554 +0800
|
+++ nginx-1.1.12-patched/src/http/ngx_http_request_body.c 2011-07-05 12:14:30.694321554 +0800
|
||||||
@@ -141,6 +141,7 @@
|
@@ -141,6 +141,7 @@
|
||||||
|
|
||||||
/* the whole request body was pre-read */
|
/* the whole request body was pre-read */
|
26
patches/nginx-1.1.12-server_header.patch
Normal file
26
patches/nginx-1.1.12-server_header.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff -ur lz-nginx-1.1.12/nginx-1.1.12/src/core/nginx.h lz-nginx-1.1.12-patched/nginx-1.1.12/src/core/nginx.h
|
||||||
|
--- lz-nginx-1.1.12/nginx-1.1.12/src/core/nginx.h 2010-02-12 17:31:01.000000000 +0800
|
||||||
|
+++ lz-nginx-1.1.12-patched/nginx-1.1.12/src/core/nginx.h 2010-03-30 10:52:13.240702627 +0800
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
#define nginx_version 1001012
|
||||||
|
#define NGINX_VERSION "1.1.12"
|
||||||
|
-#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.1.12-patched/nginx-1.1.12/src/core: nginx.h.orig
|
||||||
|
Only in lz-nginx-1.1.12-patched/nginx-1.1.12/src/core: nginx.h.rej
|
||||||
|
diff -ur lz-nginx-1.1.12/nginx-1.1.12/src/http/ngx_http_header_filter_module.c lz-nginx-1.1.12-patched/nginx-1.1.12/src/http/ngx_http_header_filter_module.c
|
||||||
|
--- lz-nginx-1.1.12/nginx-1.1.12/src/http/ngx_http_header_filter_module.c 2010-03-03 23:14:04.000000000 +0800
|
||||||
|
+++ lz-nginx-1.1.12-patched/nginx-1.1.12/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;
|
||||||
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.1.15/src/http/ngx_http_variables.c 2011-05-30 20:36:17.000000000 +0800
|
--- nginx-1.1.12/src/http/ngx_http_variables.c 2011-05-30 20:36:17.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/http/ngx_http_variables.c 2011-11-08 22:21:55.229247198 +0800
|
+++ nginx-1.1.12-patched/src/http/ngx_http_variables.c 2011-11-08 22:21:55.229247198 +0800
|
||||||
@@ -648,7 +648,17 @@
|
@@ -648,7 +648,17 @@
|
||||||
|
|
||||||
a = (ngx_array_t *) ((char *) r + data);
|
a = (ngx_array_t *) ((char *) r + data);
|
@ -1,6 +1,6 @@
|
|||||||
diff -ur nginx-1.1.15/src/http/ngx_http_request_body.c nginx-1.1.15-patched/src/http/ngx_http_request_body.c
|
diff -ur nginx-1.1.13/src/http/ngx_http_request_body.c nginx-1.1.13-patched/src/http/ngx_http_request_body.c
|
||||||
--- nginx-1.1.15/src/http/ngx_http_request_body.c 2011-09-30 22:36:19.000000000 +0800
|
--- nginx-1.1.13/src/http/ngx_http_request_body.c 2011-09-30 22:36:19.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/http/ngx_http_request_body.c 2011-10-21 21:54:08.460350482 +0800
|
+++ nginx-1.1.13-patched/src/http/ngx_http_request_body.c 2011-10-21 21:54:08.460350482 +0800
|
||||||
@@ -38,7 +38,7 @@
|
@@ -38,7 +38,7 @@
|
||||||
|
|
||||||
r->main->count++;
|
r->main->count++;
|
||||||
@ -77,10 +77,10 @@ diff -ur nginx-1.1.15/src/http/ngx_http_request_body.c nginx-1.1.15-patched/src/
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Only in nginx-1.1.15-patched/src/http: ngx_http_request_body.c~
|
Only in nginx-1.1.13-patched/src/http: ngx_http_request_body.c~
|
||||||
diff -ur nginx-1.1.15/src/http/ngx_http_request.c nginx-1.1.15-patched/src/http/ngx_http_request.c
|
diff -ur nginx-1.1.13/src/http/ngx_http_request.c nginx-1.1.13-patched/src/http/ngx_http_request.c
|
||||||
--- nginx-1.1.15/src/http/ngx_http_request.c 2011-09-30 22:36:19.000000000 +0800
|
--- nginx-1.1.13/src/http/ngx_http_request.c 2011-09-30 22:36:19.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/http/ngx_http_request.c 2011-10-21 19:06:38.404350692 +0800
|
+++ nginx-1.1.13-patched/src/http/ngx_http_request.c 2011-10-21 19:06:38.404350692 +0800
|
||||||
@@ -286,6 +286,8 @@
|
@@ -286,6 +286,8 @@
|
||||||
|
|
||||||
r->pipeline = hc->pipeline;
|
r->pipeline = hc->pipeline;
|
||||||
@ -99,10 +99,10 @@ diff -ur nginx-1.1.15/src/http/ngx_http_request.c nginx-1.1.15-patched/src/http/
|
|||||||
hc->request = r;
|
hc->request = r;
|
||||||
}
|
}
|
||||||
|
|
||||||
Only in nginx-1.1.15-patched/src/http: ngx_http_request.c~
|
Only in nginx-1.1.13-patched/src/http: ngx_http_request.c~
|
||||||
diff -ur nginx-1.1.15/src/http/ngx_http_request.h nginx-1.1.15-patched/src/http/ngx_http_request.h
|
diff -ur nginx-1.1.13/src/http/ngx_http_request.h nginx-1.1.13-patched/src/http/ngx_http_request.h
|
||||||
--- nginx-1.1.15/src/http/ngx_http_request.h 2011-08-29 18:39:23.000000000 +0800
|
--- nginx-1.1.13/src/http/ngx_http_request.h 2011-08-29 18:39:23.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/http/ngx_http_request.h 2011-10-21 17:26:13.203807584 +0800
|
+++ nginx-1.1.13-patched/src/http/ngx_http_request.h 2011-10-21 17:26:13.203807584 +0800
|
||||||
@@ -366,6 +366,9 @@
|
@@ -366,6 +366,9 @@
|
||||||
ngx_pool_t *pool;
|
ngx_pool_t *pool;
|
||||||
ngx_buf_t *header_in;
|
ngx_buf_t *header_in;
|
||||||
@ -113,5 +113,5 @@ diff -ur nginx-1.1.15/src/http/ngx_http_request.h nginx-1.1.15-patched/src/http/
|
|||||||
ngx_http_headers_in_t headers_in;
|
ngx_http_headers_in_t headers_in;
|
||||||
ngx_http_headers_out_t headers_out;
|
ngx_http_headers_out_t headers_out;
|
||||||
|
|
||||||
Only in nginx-1.1.15-patched/src/http: ngx_http_request.h~
|
Only in nginx-1.1.13-patched/src/http: ngx_http_request.h~
|
||||||
Only in nginx-1.1.15-patched/src/http: tags
|
Only in nginx-1.1.13-patched/src/http: tags
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.0.12/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800
|
--- nginx-1.1.13/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/event/modules/ngx_epoll_module.c 2011-11-30 11:08:46.775817019 +0800
|
+++ nginx-1.1.13-patched/src/event/modules/ngx_epoll_module.c 2011-11-30 11:08:46.775817019 +0800
|
||||||
@@ -682,6 +682,17 @@
|
@@ -682,6 +682,17 @@
|
||||||
wev = c->write;
|
wev = c->write;
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.1.15/src/http/modules/ngx_http_log_module.c 2011-11-01 21:24:50.000000000 +0800
|
--- nginx-1.1.13/src/http/modules/ngx_http_log_module.c 2011-11-01 21:24:50.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/http/modules/ngx_http_log_module.c 2011-11-10 16:17:29.599039534 +0800
|
+++ nginx-1.1.13-patched/src/http/modules/ngx_http_log_module.c 2011-11-10 16:17:29.599039534 +0800
|
||||||
@@ -61,6 +61,8 @@
|
@@ -61,6 +61,8 @@
|
||||||
time_t open_file_cache_valid;
|
time_t open_file_cache_valid;
|
||||||
ngx_uint_t open_file_cache_min_uses;
|
ngx_uint_t open_file_cache_min_uses;
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.1.15/src/http/ngx_http_core_module.c 2011-09-27 19:14:02.000000000 +0800
|
--- nginx-1.1.13/src/http/ngx_http_core_module.c 2011-09-27 19:14:02.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/http/ngx_http_core_module.c 2011-10-13 15:02:24.414550532 +0800
|
+++ nginx-1.1.13-patched/src/http/ngx_http_core_module.c 2011-10-13 15:02:24.414550532 +0800
|
||||||
@@ -2542,6 +2542,9 @@
|
@@ -2542,6 +2542,9 @@
|
||||||
r->content_handler = NULL;
|
r->content_handler = NULL;
|
||||||
r->loc_conf = (*clcfp)->loc_conf;
|
r->loc_conf = (*clcfp)->loc_conf;
|
24
patches/nginx-1.1.13-no_Werror.patch
Normal file
24
patches/nginx-1.1.13-no_Werror.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -ur nginx-1.1.13/auto/cc/gcc nginx-1.1.13-patched/auto/cc/gcc
|
||||||
|
--- nginx-1.1.13/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800
|
||||||
|
+++ nginx-1.1.13-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-1.1.13/auto/cc/icc nginx-1.1.13-patched/auto/cc/icc
|
||||||
|
--- nginx-1.1.13/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800
|
||||||
|
+++ nginx-1.1.13-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"
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.0.12/src/http/ngx_http_core_module.c 2010-12-14 18:38:42.000000000 +0800
|
--- nginx-1.1.13/src/http/ngx_http_core_module.c 2010-12-14 18:38:42.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/http/ngx_http_core_module.c 2011-01-30 19:24:34.956354518 +0800
|
+++ nginx-1.1.13-patched/src/http/ngx_http_core_module.c 2011-01-30 19:24:34.956354518 +0800
|
||||||
@@ -57,6 +57,8 @@
|
@@ -57,6 +57,8 @@
|
||||||
void *conf);
|
void *conf);
|
||||||
static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd,
|
static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd,
|
@ -1,18 +1,18 @@
|
|||||||
diff -ur nginx-1.1.15/src/core/nginx.h nginx-1.1.15-patched/src/core/nginx.h
|
diff -ur nginx-1.1.13/src/core/nginx.h nginx-1.1.13-patched/src/core/nginx.h
|
||||||
--- nginx-1.1.15/src/core/nginx.h 2011-08-29 17:30:22.000000000 +0800
|
--- nginx-1.1.13/src/core/nginx.h 2011-08-29 17:30:22.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/core/nginx.h 2011-09-13 12:11:03.135622101 +0800
|
+++ nginx-1.1.13-patched/src/core/nginx.h 2011-09-13 12:11:03.135622101 +0800
|
||||||
@@ -10,7 +10,7 @@
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
|
||||||
#define nginx_version 1001015
|
#define nginx_version 1001013
|
||||||
#define NGINX_VERSION "1.1.15"
|
#define NGINX_VERSION "1.1.13"
|
||||||
-#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown"
|
-#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown"
|
||||||
+#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
|
+#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
|
||||||
|
|
||||||
#define NGINX_VAR "NGINX"
|
#define NGINX_VAR "NGINX"
|
||||||
diff -ur nginx-1.1.15/src/core/ngx_array.c nginx-1.1.15-patched/src/core/ngx_array.c
|
diff -ur nginx-1.1.13/src/core/ngx_array.c nginx-1.1.13-patched/src/core/ngx_array.c
|
||||||
--- nginx-1.1.15/src/core/ngx_array.c 2008-06-17 23:00:30.000000000 +0800
|
--- nginx-1.1.13/src/core/ngx_array.c 2008-06-17 23:00:30.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/core/ngx_array.c 2011-09-14 12:02:56.263128538 +0800
|
+++ nginx-1.1.13-patched/src/core/ngx_array.c 2011-09-14 12:02:56.263128538 +0800
|
||||||
@@ -39,13 +39,7 @@
|
@@ -39,13 +39,7 @@
|
||||||
|
|
||||||
p = a->pool;
|
p = a->pool;
|
||||||
@ -121,9 +121,9 @@ diff -ur nginx-1.1.15/src/core/ngx_array.c nginx-1.1.15-patched/src/core/ngx_arr
|
|||||||
}
|
}
|
||||||
|
|
||||||
elt = (u_char *) a->elts + a->size * a->nelts;
|
elt = (u_char *) a->elts + a->size * a->nelts;
|
||||||
diff -ur nginx-1.1.15/src/core/ngx_palloc.c nginx-1.1.15-patched/src/core/ngx_palloc.c
|
diff -ur nginx-1.1.13/src/core/ngx_palloc.c nginx-1.1.13-patched/src/core/ngx_palloc.c
|
||||||
--- nginx-1.1.15/src/core/ngx_palloc.c 2009-12-17 20:25:46.000000000 +0800
|
--- nginx-1.1.13/src/core/ngx_palloc.c 2009-12-17 20:25:46.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/core/ngx_palloc.c 2011-09-14 12:03:41.663126519 +0800
|
+++ nginx-1.1.13-patched/src/core/ngx_palloc.c 2011-09-14 12:03:41.663126519 +0800
|
||||||
@@ -8,24 +8,31 @@
|
@@ -8,24 +8,31 @@
|
||||||
#include <ngx_core.h>
|
#include <ngx_core.h>
|
||||||
|
|
||||||
@ -468,9 +468,9 @@ diff -ur nginx-1.1.15/src/core/ngx_palloc.c nginx-1.1.15-patched/src/core/ngx_pa
|
|||||||
}
|
}
|
||||||
|
|
||||||
return NGX_DECLINED;
|
return NGX_DECLINED;
|
||||||
diff -ur nginx-1.1.15/src/core/ngx_palloc.h nginx-1.1.15-patched/src/core/ngx_palloc.h
|
diff -ur nginx-1.1.13/src/core/ngx_palloc.h nginx-1.1.13-patched/src/core/ngx_palloc.h
|
||||||
--- nginx-1.1.15/src/core/ngx_palloc.h 2009-12-17 20:25:46.000000000 +0800
|
--- nginx-1.1.13/src/core/ngx_palloc.h 2009-12-17 20:25:46.000000000 +0800
|
||||||
+++ nginx-1.1.15-patched/src/core/ngx_palloc.h 2011-09-13 12:11:03.155622101 +0800
|
+++ nginx-1.1.13-patched/src/core/ngx_palloc.h 2011-09-13 12:11:03.155622101 +0800
|
||||||
@@ -38,6 +38,7 @@
|
@@ -38,6 +38,7 @@
|
||||||
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
|||||||
# Parent 610e909bb9e29766188aa86fae3abe0bd3432940
|
# Parent 610e909bb9e29766188aa86fae3abe0bd3432940
|
||||||
Core: fix body if it's preread and there are extra data.
|
Core: fix body if it's preread and there are extra data.
|
||||||
|
|
||||||
--- nginx-1.0.12/src/http/ngx_http_request_body.c 2011-07-05 12:11:21.619264633 +0800
|
--- nginx-1.1.13/src/http/ngx_http_request_body.c 2011-07-05 12:11:21.619264633 +0800
|
||||||
+++ nginx-1.0.12-patched/src/http/ngx_http_request_body.c 2011-07-05 12:14:30.694321554 +0800
|
+++ nginx-1.1.13-patched/src/http/ngx_http_request_body.c 2011-07-05 12:14:30.694321554 +0800
|
||||||
@@ -141,6 +141,7 @@
|
@@ -141,6 +141,7 @@
|
||||||
|
|
||||||
/* the whole request body was pre-read */
|
/* the whole request body was pre-read */
|
26
patches/nginx-1.1.13-server_header.patch
Normal file
26
patches/nginx-1.1.13-server_header.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff -ur lz-nginx-1.1.13/nginx-1.1.13/src/core/nginx.h lz-nginx-1.1.13-patched/nginx-1.1.13/src/core/nginx.h
|
||||||
|
--- lz-nginx-1.1.13/nginx-1.1.13/src/core/nginx.h 2010-02-12 17:31:01.000000000 +0800
|
||||||
|
+++ lz-nginx-1.1.13-patched/nginx-1.1.13/src/core/nginx.h 2010-03-30 10:52:13.240702627 +0800
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
#define nginx_version 1001013
|
||||||
|
#define NGINX_VERSION "1.1.13"
|
||||||
|
-#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.1.13-patched/nginx-1.1.13/src/core: nginx.h.orig
|
||||||
|
Only in lz-nginx-1.1.13-patched/nginx-1.1.13/src/core: nginx.h.rej
|
||||||
|
diff -ur lz-nginx-1.1.13/nginx-1.1.13/src/http/ngx_http_header_filter_module.c lz-nginx-1.1.13-patched/nginx-1.1.13/src/http/ngx_http_header_filter_module.c
|
||||||
|
--- lz-nginx-1.1.13/nginx-1.1.13/src/http/ngx_http_header_filter_module.c 2010-03-03 23:14:04.000000000 +0800
|
||||||
|
+++ lz-nginx-1.1.13-patched/nginx-1.1.13/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;
|
||||||
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
--- nginx-1.0.12/src/http/ngx_http_variables.c 2011-05-30 20:36:17.000000000 +0800
|
--- nginx-1.1.13/src/http/ngx_http_variables.c 2011-05-30 20:36:17.000000000 +0800
|
||||||
+++ nginx-1.0.12-patched/src/http/ngx_http_variables.c 2011-11-08 22:21:55.229247198 +0800
|
+++ nginx-1.1.13-patched/src/http/ngx_http_variables.c 2011-11-08 22:21:55.229247198 +0800
|
||||||
@@ -648,7 +648,17 @@
|
@@ -648,7 +648,17 @@
|
||||||
|
|
||||||
a = (ngx_array_t *) ((char *) r + data);
|
a = (ngx_array_t *) ((char *) r + data);
|
@ -1,24 +0,0 @@
|
|||||||
diff -ur nginx-1.1.15/auto/cc/gcc nginx-1.1.15-patched/auto/cc/gcc
|
|
||||||
--- nginx-1.1.15/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800
|
|
||||||
+++ nginx-1.1.15-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-1.1.15/auto/cc/icc nginx-1.1.15-patched/auto/cc/icc
|
|
||||||
--- nginx-1.1.15/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800
|
|
||||||
+++ nginx-1.1.15-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"
|
|
@ -1,113 +0,0 @@
|
|||||||
--- src/http/modules/ngx_http_fastcgi_module.c
|
|
||||||
+++ src/http/modules/ngx_http_fastcgi_module.c
|
|
||||||
@@ -1501,10 +1501,10 @@ ngx_http_fastcgi_process_header(ngx_http
|
|
||||||
h->lowcase_key = h->key.data + h->key.len + 1
|
|
||||||
+ h->value.len + 1;
|
|
||||||
|
|
||||||
- ngx_cpystrn(h->key.data, r->header_name_start,
|
|
||||||
- h->key.len + 1);
|
|
||||||
- ngx_cpystrn(h->value.data, r->header_start,
|
|
||||||
- h->value.len + 1);
|
|
||||||
+ ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
|
|
||||||
+ h->key.data[h->key.len] = '\0';
|
|
||||||
+ ngx_memcpy(h->value.data, r->header_start, h->value.len);
|
|
||||||
+ h->value.data[h->value.len] = '\0';
|
|
||||||
}
|
|
||||||
|
|
||||||
h->hash = r->header_hash;
|
|
||||||
--- src/http/modules/ngx_http_proxy_module.c
|
|
||||||
+++ src/http/modules/ngx_http_proxy_module.c
|
|
||||||
@@ -1381,8 +1381,10 @@ ngx_http_proxy_process_header(ngx_http_r
|
|
||||||
h->value.data = h->key.data + h->key.len + 1;
|
|
||||||
h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
|
|
||||||
|
|
||||||
- ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
|
|
||||||
- ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
|
|
||||||
+ ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
|
|
||||||
+ h->key.data[h->key.len] = '\0';
|
|
||||||
+ ngx_memcpy(h->value.data, r->header_start, h->value.len);
|
|
||||||
+ h->value.data[h->value.len] = '\0';
|
|
||||||
|
|
||||||
if (h->key.len == r->lowcase_index) {
|
|
||||||
ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
|
|
||||||
--- src/http/modules/ngx_http_scgi_module.c
|
|
||||||
+++ src/http/modules/ngx_http_scgi_module.c
|
|
||||||
@@ -941,8 +941,10 @@ ngx_http_scgi_process_header(ngx_http_re
|
|
||||||
h->value.data = h->key.data + h->key.len + 1;
|
|
||||||
h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
|
|
||||||
|
|
||||||
- ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
|
|
||||||
- ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
|
|
||||||
+ ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
|
|
||||||
+ h->key.data[h->key.len] = '\0';
|
|
||||||
+ ngx_memcpy(h->value.data, r->header_start, h->value.len);
|
|
||||||
+ h->value.data[h->value.len] = '\0';
|
|
||||||
|
|
||||||
if (h->key.len == r->lowcase_index) {
|
|
||||||
ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
|
|
||||||
--- src/http/modules/ngx_http_uwsgi_module.c
|
|
||||||
+++ src/http/modules/ngx_http_uwsgi_module.c
|
|
||||||
@@ -985,8 +985,10 @@ ngx_http_uwsgi_process_header(ngx_http_r
|
|
||||||
h->value.data = h->key.data + h->key.len + 1;
|
|
||||||
h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
|
|
||||||
|
|
||||||
- ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1);
|
|
||||||
- ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1);
|
|
||||||
+ ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
|
|
||||||
+ h->key.data[h->key.len] = '\0';
|
|
||||||
+ ngx_memcpy(h->value.data, r->header_start, h->value.len);
|
|
||||||
+ h->value.data[h->value.len] = '\0';
|
|
||||||
|
|
||||||
if (h->key.len == r->lowcase_index) {
|
|
||||||
ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
|
|
||||||
--- src/http/ngx_http_parse.c
|
|
||||||
+++ src/http/ngx_http_parse.c
|
|
||||||
@@ -874,6 +874,10 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (ch == '\0') {
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
r->invalid_header = 1;
|
|
||||||
|
|
||||||
break;
|
|
||||||
@@ -936,6 +940,10 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (ch == '\0') {
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
r->invalid_header = 1;
|
|
||||||
|
|
||||||
break;
|
|
||||||
@@ -954,6 +962,8 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
r->header_start = p;
|
|
||||||
r->header_end = p;
|
|
||||||
goto done;
|
|
||||||
+ case '\0':
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
default:
|
|
||||||
r->header_start = p;
|
|
||||||
state = sw_value;
|
|
||||||
@@ -975,6 +985,8 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
case LF:
|
|
||||||
r->header_end = p;
|
|
||||||
goto done;
|
|
||||||
+ case '\0':
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
@@ -988,6 +1000,8 @@ ngx_http_parse_header_line(ngx_http_requ
|
|
||||||
break;
|
|
||||||
case LF:
|
|
||||||
goto done;
|
|
||||||
+ case '\0':
|
|
||||||
+ return NGX_HTTP_PARSE_INVALID_HEADER;
|
|
||||||
default:
|
|
||||||
state = sw_value;
|
|
||||||
break;
|
|
@ -1,26 +0,0 @@
|
|||||||
diff -ur lz-nginx-1.1.15/nginx-1.1.15/src/core/nginx.h lz-nginx-1.1.15-patched/nginx-1.1.15/src/core/nginx.h
|
|
||||||
--- lz-nginx-1.1.15/nginx-1.1.15/src/core/nginx.h 2010-02-12 17:31:01.000000000 +0800
|
|
||||||
+++ lz-nginx-1.1.15-patched/nginx-1.1.15/src/core/nginx.h 2010-03-30 10:52:13.240702627 +0800
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
|
|
||||||
#define nginx_version 1001015
|
|
||||||
#define NGINX_VERSION "1.1.15"
|
|
||||||
-#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.1.15-patched/nginx-1.1.15/src/core: nginx.h.orig
|
|
||||||
Only in lz-nginx-1.1.15-patched/nginx-1.1.15/src/core: nginx.h.rej
|
|
||||||
diff -ur lz-nginx-1.1.15/nginx-1.1.15/src/http/ngx_http_header_filter_module.c lz-nginx-1.1.15-patched/nginx-1.1.15/src/http/ngx_http_header_filter_module.c
|
|
||||||
--- lz-nginx-1.1.15/nginx-1.1.15/src/http/ngx_http_header_filter_module.c 2010-03-03 23:14:04.000000000 +0800
|
|
||||||
+++ lz-nginx-1.1.15-patched/nginx-1.1.15/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;
|
|
||||||
|
|
||||||
|
|
69
patches/nginx-1.1.4-gzip_empty_flush_buf.patch
Normal file
69
patches/nginx-1.1.4-gzip_empty_flush_buf.patch
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Maxim Dounin <mdounin@mdounin.ru>
|
||||||
|
# Date 1315324342 -14400
|
||||||
|
# Node ID 4cf0af103bc382a78f894302d1706929a79df4bb
|
||||||
|
# Parent d603ce98fada855f0100b422b7b5672fd22fabea
|
||||||
|
Gzip filter: handle empty flush buffers.
|
||||||
|
|
||||||
|
Empty flush buffers are legitimate and may happen e.g. due to $r->flush()
|
||||||
|
calls in embedded perl. If there are no data buffered in zlib deflate()
|
||||||
|
will return Z_BUF_ERROR (i.e. no progress possible) without adding anything
|
||||||
|
to output. Don't treat Z_BUF_ERROR as fatal and correctly send empty flush
|
||||||
|
buffer if we have no data in output at all.
|
||||||
|
|
||||||
|
See this thread for details:
|
||||||
|
http://mailman.nginx.org/pipermail/nginx/2010-November/023693.html
|
||||||
|
|
||||||
|
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
|
||||||
|
--- a/src/http/modules/ngx_http_gzip_filter_module.c
|
||||||
|
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
|
||||||
|
@@ -758,6 +758,7 @@ static ngx_int_t
|
||||||
|
ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
|
||||||
|
{
|
||||||
|
int rc;
|
||||||
|
+ ngx_buf_t *b;
|
||||||
|
ngx_chain_t *cl;
|
||||||
|
ngx_http_gzip_conf_t *conf;
|
||||||
|
|
||||||
|
@@ -769,7 +770,7 @@ ngx_http_gzip_filter_deflate(ngx_http_re
|
||||||
|
|
||||||
|
rc = deflate(&ctx->zstream, ctx->flush);
|
||||||
|
|
||||||
|
- if (rc != Z_OK && rc != Z_STREAM_END) {
|
||||||
|
+ if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) {
|
||||||
|
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
|
||||||
|
"deflate() failed: %d, %d", ctx->flush, rc);
|
||||||
|
return NGX_ERROR;
|
||||||
|
@@ -818,8 +819,6 @@ ngx_http_gzip_filter_deflate(ngx_http_re
|
||||||
|
|
||||||
|
if (ctx->flush == Z_SYNC_FLUSH) {
|
||||||
|
|
||||||
|
- ctx->zstream.avail_out = 0;
|
||||||
|
- ctx->out_buf->flush = 1;
|
||||||
|
ctx->flush = Z_NO_FLUSH;
|
||||||
|
|
||||||
|
cl = ngx_alloc_chain_link(r->pool);
|
||||||
|
@@ -827,7 +826,22 @@ ngx_http_gzip_filter_deflate(ngx_http_re
|
||||||
|
return NGX_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
- cl->buf = ctx->out_buf;
|
||||||
|
+ b = ctx->out_buf;
|
||||||
|
+
|
||||||
|
+ if (ngx_buf_size(b) == 0) {
|
||||||
|
+
|
||||||
|
+ b = ngx_calloc_buf(ctx->request->pool);
|
||||||
|
+ if (b == NULL) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ } else {
|
||||||
|
+ ctx->zstream.avail_out = 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ b->flush = 1;
|
||||||
|
+
|
||||||
|
+ cl->buf = b;
|
||||||
|
cl->next = NULL;
|
||||||
|
*ctx->last_out = cl;
|
||||||
|
ctx->last_out = &cl->next;
|
24
patches/nginx-1.1.4-no_Werror.patch
Normal file
24
patches/nginx-1.1.4-no_Werror.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -ur nginx-1.1.4/auto/cc/gcc nginx-1.1.4-patched/auto/cc/gcc
|
||||||
|
--- nginx-1.1.4/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800
|
||||||
|
+++ nginx-1.1.4-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-1.1.4/auto/cc/icc nginx-1.1.4-patched/auto/cc/icc
|
||||||
|
--- nginx-1.1.4/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800
|
||||||
|
+++ nginx-1.1.4-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"
|
90
patches/nginx-1.1.4-no_error_pages.patch
Normal file
90
patches/nginx-1.1.4-no_error_pages.patch
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
--- nginx-1.1.4/src/http/ngx_http_core_module.c 2010-12-14 18:38:42.000000000 +0800
|
||||||
|
+++ nginx-1.1.4-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;
|
504
patches/nginx-1.1.4-no_pool.patch
Normal file
504
patches/nginx-1.1.4-no_pool.patch
Normal file
@ -0,0 +1,504 @@
|
|||||||
|
diff -ur nginx-1.1.4/src/core/nginx.h nginx-1.1.4-patched/src/core/nginx.h
|
||||||
|
--- nginx-1.1.4/src/core/nginx.h 2011-08-29 17:30:22.000000000 +0800
|
||||||
|
+++ nginx-1.1.4-patched/src/core/nginx.h 2011-09-13 12:11:03.135622101 +0800
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
#define nginx_version 1001004
|
||||||
|
#define NGINX_VERSION "1.1.4"
|
||||||
|
-#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown"
|
||||||
|
+#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
|
||||||
|
|
||||||
|
#define NGINX_VAR "NGINX"
|
||||||
|
diff -ur nginx-1.1.4/src/core/ngx_array.c nginx-1.1.4-patched/src/core/ngx_array.c
|
||||||
|
--- nginx-1.1.4/src/core/ngx_array.c 2008-06-17 23:00:30.000000000 +0800
|
||||||
|
+++ nginx-1.1.4-patched/src/core/ngx_array.c 2011-09-14 12:02:56.263128538 +0800
|
||||||
|
@@ -39,13 +39,7 @@
|
||||||
|
|
||||||
|
p = a->pool;
|
||||||
|
|
||||||
|
- if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
|
||||||
|
- p->d.last -= a->size * a->nalloc;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
|
||||||
|
- p->d.last = (u_char *) a;
|
||||||
|
- }
|
||||||
|
+ ngx_pfree(p, a);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -64,29 +58,17 @@
|
||||||
|
|
||||||
|
p = a->pool;
|
||||||
|
|
||||||
|
- if ((u_char *) a->elts + size == p->d.last
|
||||||
|
- && p->d.last + a->size <= p->d.end)
|
||||||
|
- {
|
||||||
|
- /*
|
||||||
|
- * the array allocation is the last in the pool
|
||||||
|
- * and there is space for new allocation
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- p->d.last += a->size;
|
||||||
|
- a->nalloc++;
|
||||||
|
-
|
||||||
|
- } else {
|
||||||
|
- /* allocate a new array */
|
||||||
|
-
|
||||||
|
- new = ngx_palloc(p, 2 * size);
|
||||||
|
- if (new == NULL) {
|
||||||
|
- return NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- ngx_memcpy(new, a->elts, size);
|
||||||
|
- a->elts = new;
|
||||||
|
- a->nalloc *= 2;
|
||||||
|
+ /* allocate a new array */
|
||||||
|
+
|
||||||
|
+ new = ngx_palloc(p, 2 * size);
|
||||||
|
+ if (new == NULL) {
|
||||||
|
+ return NULL;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ ngx_memcpy(new, a->elts, size);
|
||||||
|
+ a->elts = new;
|
||||||
|
+ a->nalloc *= 2;
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
elt = (u_char *) a->elts + a->size * a->nelts;
|
||||||
|
@@ -100,43 +82,25 @@
|
||||||
|
ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
|
||||||
|
{
|
||||||
|
void *elt, *new;
|
||||||
|
- size_t size;
|
||||||
|
ngx_uint_t nalloc;
|
||||||
|
ngx_pool_t *p;
|
||||||
|
|
||||||
|
- size = n * a->size;
|
||||||
|
-
|
||||||
|
if (a->nelts + n > a->nalloc) {
|
||||||
|
|
||||||
|
/* the array is full */
|
||||||
|
|
||||||
|
p = a->pool;
|
||||||
|
|
||||||
|
- if ((u_char *) a->elts + a->size * a->nalloc == p->d.last
|
||||||
|
- && p->d.last + size <= p->d.end)
|
||||||
|
- {
|
||||||
|
- /*
|
||||||
|
- * the array allocation is the last in the pool
|
||||||
|
- * and there is space for new allocation
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- p->d.last += size;
|
||||||
|
- a->nalloc += n;
|
||||||
|
-
|
||||||
|
- } else {
|
||||||
|
- /* allocate a new array */
|
||||||
|
-
|
||||||
|
- nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
|
||||||
|
-
|
||||||
|
- new = ngx_palloc(p, nalloc * a->size);
|
||||||
|
- if (new == NULL) {
|
||||||
|
- return NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- ngx_memcpy(new, a->elts, a->nelts * a->size);
|
||||||
|
- a->elts = new;
|
||||||
|
- a->nalloc = nalloc;
|
||||||
|
+ nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
|
||||||
|
+
|
||||||
|
+ new = ngx_palloc(p, nalloc * a->size);
|
||||||
|
+ if (new == NULL) {
|
||||||
|
+ return NULL;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ ngx_memcpy(new, a->elts, a->nelts * a->size);
|
||||||
|
+ a->elts = new;
|
||||||
|
+ a->nalloc = nalloc;
|
||||||
|
}
|
||||||
|
|
||||||
|
elt = (u_char *) a->elts + a->size * a->nelts;
|
||||||
|
diff -ur nginx-1.1.4/src/core/ngx_palloc.c nginx-1.1.4-patched/src/core/ngx_palloc.c
|
||||||
|
--- nginx-1.1.4/src/core/ngx_palloc.c 2009-12-17 20:25:46.000000000 +0800
|
||||||
|
+++ nginx-1.1.4-patched/src/core/ngx_palloc.c 2011-09-14 12:03:41.663126519 +0800
|
||||||
|
@@ -8,24 +8,31 @@
|
||||||
|
#include <ngx_core.h>
|
||||||
|
|
||||||
|
|
||||||
|
-static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
|
||||||
|
static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
|
||||||
|
|
||||||
|
|
||||||
|
ngx_pool_t *
|
||||||
|
ngx_create_pool(size_t size, ngx_log_t *log)
|
||||||
|
{
|
||||||
|
- ngx_pool_t *p;
|
||||||
|
+ ngx_pool_t *p;
|
||||||
|
+ ngx_pool_data_t *d;
|
||||||
|
|
||||||
|
- p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
|
||||||
|
+ size = sizeof(ngx_pool_t);
|
||||||
|
+ p = ngx_alloc(size, log);
|
||||||
|
if (p == NULL) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- p->d.last = (u_char *) p + sizeof(ngx_pool_t);
|
||||||
|
- p->d.end = (u_char *) p + size;
|
||||||
|
- p->d.next = NULL;
|
||||||
|
- p->d.failed = 0;
|
||||||
|
+ d = ngx_alloc(sizeof(ngx_pool_data_t), log);
|
||||||
|
+
|
||||||
|
+ if (d == NULL) {
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ d->next = d;
|
||||||
|
+ d->prev = d;
|
||||||
|
+ d->alloc = NULL;
|
||||||
|
+ p->d = d;
|
||||||
|
|
||||||
|
size = size - sizeof(ngx_pool_t);
|
||||||
|
p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
|
||||||
|
@@ -43,7 +50,7 @@
|
||||||
|
void
|
||||||
|
ngx_destroy_pool(ngx_pool_t *pool)
|
||||||
|
{
|
||||||
|
- ngx_pool_t *p, *n;
|
||||||
|
+ ngx_pool_data_t *d, *n;
|
||||||
|
ngx_pool_large_t *l;
|
||||||
|
ngx_pool_cleanup_t *c;
|
||||||
|
|
||||||
|
@@ -55,7 +62,7 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- for (l = pool->large; l; l = l->next) {
|
||||||
|
+ for (l = pool->large; l ; l = l->next) {
|
||||||
|
|
||||||
|
ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
|
||||||
|
|
||||||
|
@@ -71,34 +78,45 @@
|
||||||
|
* so we can not use this log while the free()ing the pool
|
||||||
|
*/
|
||||||
|
|
||||||
|
- for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
|
||||||
|
+ for (d = pool->d, n = d->next; ; d = n, n = n->next) {
|
||||||
|
ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
|
||||||
|
- "free: %p, unused: %uz", p, p->d.end - p->d.last);
|
||||||
|
+ "free: %p", d);
|
||||||
|
|
||||||
|
- if (n == NULL) {
|
||||||
|
+ if (n == pool->d) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
+ if (pool->d->next == pool->d) {
|
||||||
|
+ ngx_free(pool->d);
|
||||||
|
+ } else {
|
||||||
|
+ for (d = pool->d, n = d->next; ; d = n, n = n->next) {
|
||||||
|
+ if (d->alloc) {
|
||||||
|
+ ngx_free(d->alloc);
|
||||||
|
+ }
|
||||||
|
+ ngx_free(d);
|
||||||
|
|
||||||
|
- for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
|
||||||
|
- ngx_free(p);
|
||||||
|
-
|
||||||
|
- if (n == NULL) {
|
||||||
|
- break;
|
||||||
|
+ if (n == pool->d) {
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ ngx_free(pool);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
ngx_reset_pool(ngx_pool_t *pool)
|
||||||
|
{
|
||||||
|
- ngx_pool_t *p;
|
||||||
|
- ngx_pool_large_t *l;
|
||||||
|
+ ngx_pool_data_t *p, *tmp;
|
||||||
|
+ ngx_pool_large_t *l;
|
||||||
|
+
|
||||||
|
+ for (l = pool->large; l ; l = l->next) {
|
||||||
|
+
|
||||||
|
+ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
|
||||||
|
|
||||||
|
- for (l = pool->large; l; l = l->next) {
|
||||||
|
if (l->alloc) {
|
||||||
|
ngx_free(l->alloc);
|
||||||
|
}
|
||||||
|
@@ -106,109 +124,65 @@
|
||||||
|
|
||||||
|
pool->large = NULL;
|
||||||
|
|
||||||
|
- for (p = pool; p; p = p->d.next) {
|
||||||
|
- p->d.last = (u_char *) p + sizeof(ngx_pool_t);
|
||||||
|
+ p = pool->d->next;
|
||||||
|
+ while (p != pool->d) {
|
||||||
|
+ tmp = p;
|
||||||
|
+ ngx_free(p->alloc);
|
||||||
|
+ p->prev->next = p->next;
|
||||||
|
+ p->next->prev = p->prev;
|
||||||
|
+ p = p->next;
|
||||||
|
+ ngx_free(tmp);
|
||||||
|
}
|
||||||
|
-}
|
||||||
|
|
||||||
|
+ ngx_free(pool->d->alloc);
|
||||||
|
+ pool->d->alloc = NULL;
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
|
||||||
|
void *
|
||||||
|
-ngx_palloc(ngx_pool_t *pool, size_t size)
|
||||||
|
+ngx_malloc(ngx_pool_t *pool, size_t size)
|
||||||
|
{
|
||||||
|
- u_char *m;
|
||||||
|
- ngx_pool_t *p;
|
||||||
|
-
|
||||||
|
- if (size <= pool->max) {
|
||||||
|
+ ngx_pool_data_t *new;
|
||||||
|
+ void *m;
|
||||||
|
|
||||||
|
- p = pool->current;
|
||||||
|
-
|
||||||
|
- do {
|
||||||
|
- m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
|
||||||
|
-
|
||||||
|
- if ((size_t) (p->d.end - m) >= size) {
|
||||||
|
- p->d.last = m + size;
|
||||||
|
-
|
||||||
|
- return m;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- p = p->d.next;
|
||||||
|
-
|
||||||
|
- } while (p);
|
||||||
|
+ m = ngx_alloc(size, pool->log);
|
||||||
|
+ if (m == NULL) {
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- return ngx_palloc_block(pool, size);
|
||||||
|
+ new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
|
||||||
|
+ if (new == NULL){
|
||||||
|
+ ngx_free(m);
|
||||||
|
+ return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- return ngx_palloc_large(pool, size);
|
||||||
|
+ new->alloc = m;
|
||||||
|
+ new->next = pool->d;
|
||||||
|
+ new->prev = pool->d->prev;
|
||||||
|
+ pool->d->prev->next = new;
|
||||||
|
+ pool->d->prev = new;
|
||||||
|
+ return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
void *
|
||||||
|
-ngx_pnalloc(ngx_pool_t *pool, size_t size)
|
||||||
|
+ngx_palloc(ngx_pool_t *pool, size_t size)
|
||||||
|
{
|
||||||
|
- u_char *m;
|
||||||
|
- ngx_pool_t *p;
|
||||||
|
-
|
||||||
|
- if (size <= pool->max) {
|
||||||
|
-
|
||||||
|
- p = pool->current;
|
||||||
|
-
|
||||||
|
- do {
|
||||||
|
- m = p->d.last;
|
||||||
|
-
|
||||||
|
- if ((size_t) (p->d.end - m) >= size) {
|
||||||
|
- p->d.last = m + size;
|
||||||
|
-
|
||||||
|
- return m;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- p = p->d.next;
|
||||||
|
-
|
||||||
|
- } while (p);
|
||||||
|
-
|
||||||
|
- return ngx_palloc_block(pool, size);
|
||||||
|
+ if (size <= 1024) {
|
||||||
|
+ return ngx_malloc(pool, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ngx_palloc_large(pool, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-static void *
|
||||||
|
-ngx_palloc_block(ngx_pool_t *pool, size_t size)
|
||||||
|
+void *
|
||||||
|
+ngx_pnalloc(ngx_pool_t *pool, size_t size)
|
||||||
|
{
|
||||||
|
- u_char *m;
|
||||||
|
- size_t psize;
|
||||||
|
- ngx_pool_t *p, *new, *current;
|
||||||
|
-
|
||||||
|
- psize = (size_t) (pool->d.end - (u_char *) pool);
|
||||||
|
-
|
||||||
|
- m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
|
||||||
|
- if (m == NULL) {
|
||||||
|
- return NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- new = (ngx_pool_t *) m;
|
||||||
|
-
|
||||||
|
- new->d.end = m + psize;
|
||||||
|
- new->d.next = NULL;
|
||||||
|
- new->d.failed = 0;
|
||||||
|
-
|
||||||
|
- m += sizeof(ngx_pool_data_t);
|
||||||
|
- m = ngx_align_ptr(m, NGX_ALIGNMENT);
|
||||||
|
- new->d.last = m + size;
|
||||||
|
-
|
||||||
|
- current = pool->current;
|
||||||
|
-
|
||||||
|
- for (p = current; p->d.next; p = p->d.next) {
|
||||||
|
- if (p->d.failed++ > 4) {
|
||||||
|
- current = p->d.next;
|
||||||
|
- }
|
||||||
|
+ if (size <= 1024) {
|
||||||
|
+ return ngx_malloc(pool, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
- p->d.next = new;
|
||||||
|
-
|
||||||
|
- pool->current = current ? current : new;
|
||||||
|
-
|
||||||
|
- return m;
|
||||||
|
+ return ngx_palloc_large(pool, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -216,7 +190,6 @@
|
||||||
|
ngx_palloc_large(ngx_pool_t *pool, size_t size)
|
||||||
|
{
|
||||||
|
void *p;
|
||||||
|
- ngx_uint_t n;
|
||||||
|
ngx_pool_large_t *large;
|
||||||
|
|
||||||
|
p = ngx_alloc(size, pool->log);
|
||||||
|
@@ -224,20 +197,7 @@
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- n = 0;
|
||||||
|
-
|
||||||
|
- for (large = pool->large; large; large = large->next) {
|
||||||
|
- if (large->alloc == NULL) {
|
||||||
|
- large->alloc = p;
|
||||||
|
- return p;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (n++ > 3) {
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
|
||||||
|
+ large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
|
||||||
|
if (large == NULL) {
|
||||||
|
ngx_free(p);
|
||||||
|
return NULL;
|
||||||
|
@@ -262,7 +222,7 @@
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
|
||||||
|
+ large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
|
||||||
|
if (large == NULL) {
|
||||||
|
ngx_free(p);
|
||||||
|
return NULL;
|
||||||
|
@@ -279,17 +239,41 @@
|
||||||
|
ngx_int_t
|
||||||
|
ngx_pfree(ngx_pool_t *pool, void *p)
|
||||||
|
{
|
||||||
|
- ngx_pool_large_t *l;
|
||||||
|
+ ngx_pool_large_t *l;
|
||||||
|
+ ngx_pool_large_t *ll;
|
||||||
|
+ ngx_pool_data_t *d, *n;
|
||||||
|
|
||||||
|
- for (l = pool->large; l; l = l->next) {
|
||||||
|
+ for (l = pool->large, ll = l; l; ll = l, l = l->next) {
|
||||||
|
if (p == l->alloc) {
|
||||||
|
ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
|
||||||
|
"free: %p", l->alloc);
|
||||||
|
ngx_free(l->alloc);
|
||||||
|
l->alloc = NULL;
|
||||||
|
+ if (l == pool->large) {
|
||||||
|
+ pool->large = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ll->next = l->next;
|
||||||
|
+ p = l;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
+ for (d = pool->d, n = d->next; ; d = n, n = d->next) {
|
||||||
|
+ if (p == d->alloc) {
|
||||||
|
+ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
|
||||||
|
+ if (d->alloc) {
|
||||||
|
+ ngx_free(d->alloc);
|
||||||
|
+ }
|
||||||
|
+ d->alloc = NULL;
|
||||||
|
+ d->prev->next = d->next;
|
||||||
|
+ d->next->prev = d->prev;
|
||||||
|
+ ngx_free(d);
|
||||||
|
return NGX_OK;
|
||||||
|
}
|
||||||
|
+ if (d->next == pool->d) {
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
return NGX_DECLINED;
|
||||||
|
diff -ur nginx-1.1.4/src/core/ngx_palloc.h nginx-1.1.4-patched/src/core/ngx_palloc.h
|
||||||
|
--- nginx-1.1.4/src/core/ngx_palloc.h 2009-12-17 20:25:46.000000000 +0800
|
||||||
|
+++ nginx-1.1.4-patched/src/core/ngx_palloc.h 2011-09-13 12:11:03.155622101 +0800
|
||||||
|
@@ -38,6 +38,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct ngx_pool_large_s ngx_pool_large_t;
|
||||||
|
+typedef struct ngx_pool_data_s ngx_pool_data_t;
|
||||||
|
|
||||||
|
struct ngx_pool_large_s {
|
||||||
|
ngx_pool_large_t *next;
|
||||||
|
@@ -45,16 +46,15 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
-typedef struct {
|
||||||
|
- u_char *last;
|
||||||
|
- u_char *end;
|
||||||
|
- ngx_pool_t *next;
|
||||||
|
- ngx_uint_t failed;
|
||||||
|
-} ngx_pool_data_t;
|
||||||
|
+struct ngx_pool_data_s{
|
||||||
|
+ ngx_pool_data_t *next;
|
||||||
|
+ ngx_pool_data_t *prev;
|
||||||
|
+ void *alloc;
|
||||||
|
+};
|
||||||
|
|
||||||
|
|
||||||
|
struct ngx_pool_s {
|
||||||
|
- ngx_pool_data_t d;
|
||||||
|
+ ngx_pool_data_t *d;
|
||||||
|
size_t max;
|
||||||
|
ngx_pool_t *current;
|
||||||
|
ngx_chain_t *chain;
|
17
patches/nginx-1.1.4-request_body_preread_fix.patch
Normal file
17
patches/nginx-1.1.4-request_body_preread_fix.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Maxim Dounin <mdounin@mdounin.ru>
|
||||||
|
# Date 1309776931 -14400
|
||||||
|
# Node ID e7b2f945d55ae44a2295facf9e3336dc4633e5b5
|
||||||
|
# Parent 610e909bb9e29766188aa86fae3abe0bd3432940
|
||||||
|
Core: fix body if it's preread and there are extra data.
|
||||||
|
|
||||||
|
--- nginx-1.1.4/src/http/ngx_http_request_body.c 2011-07-05 12:11:21.619264633 +0800
|
||||||
|
+++ nginx-1.1.4-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;
|
||||||
|
|
26
patches/nginx-1.1.4-server_header.patch
Normal file
26
patches/nginx-1.1.4-server_header.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff -ur lz-nginx-1.1.4/nginx-1.1.4/src/core/nginx.h lz-nginx-1.1.4-patched/nginx-1.1.4/src/core/nginx.h
|
||||||
|
--- lz-nginx-1.1.4/nginx-1.1.4/src/core/nginx.h 2010-02-12 17:31:01.000000000 +0800
|
||||||
|
+++ lz-nginx-1.1.4-patched/nginx-1.1.4/src/core/nginx.h 2010-03-30 10:52:13.240702627 +0800
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
#define nginx_version 1001004
|
||||||
|
#define NGINX_VERSION "1.1.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.1.4-patched/nginx-1.1.4/src/core: nginx.h.orig
|
||||||
|
Only in lz-nginx-1.1.4-patched/nginx-1.1.4/src/core: nginx.h.rej
|
||||||
|
diff -ur lz-nginx-1.1.4/nginx-1.1.4/src/http/ngx_http_header_filter_module.c lz-nginx-1.1.4-patched/nginx-1.1.4/src/http/ngx_http_header_filter_module.c
|
||||||
|
--- lz-nginx-1.1.4/nginx-1.1.4/src/http/ngx_http_header_filter_module.c 2010-03-03 23:14:04.000000000 +0800
|
||||||
|
+++ lz-nginx-1.1.4-patched/nginx-1.1.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;
|
||||||
|
|
||||||
|
|
40
patches/nginx-1.1.4-subrequest_loop.patch
Normal file
40
patches/nginx-1.1.4-subrequest_loop.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Maxim Dounin <mdounin@mdounin.ru>
|
||||||
|
# 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) {
|
||||||
|
|
21
patches/nginx-1.1.5-epoll_check_stale_wev.patch
Normal file
21
patches/nginx-1.1.5-epoll_check_stale_wev.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
--- nginx-1.1.5/src/event/modules/ngx_epoll_module.c 2011-09-30 22:12:53.000000000 +0800
|
||||||
|
+++ nginx-1.1.5-patched/src/event/modules/ngx_epoll_module.c 2011-11-07 18:07:04.764111952 +0800
|
||||||
|
@@ -681,6 +681,18 @@
|
||||||
|
|
||||||
|
wev = c->write;
|
||||||
|
|
||||||
|
+ if (c->fd == -1 || wev->instance != instance) {
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * the stale event from a file descriptor
|
||||||
|
+ * that was just closed in this iteration
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||||||
|
+ "epoll: stale event %p", c);
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if ((revents & EPOLLOUT) && wev->active) {
|
||||||
|
|
||||||
|
if (flags & NGX_POST_THREAD_EVENTS) {
|
69
patches/nginx-1.1.5-gzip_empty_flush_buf.patch
Normal file
69
patches/nginx-1.1.5-gzip_empty_flush_buf.patch
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Maxim Dounin <mdounin@mdounin.ru>
|
||||||
|
# Date 1315324342 -14400
|
||||||
|
# Node ID 4cf0af103bc382a78f894302d1706929a79df4bb
|
||||||
|
# Parent d603ce98fada855f0100b422b7b5672fd22fabea
|
||||||
|
Gzip filter: handle empty flush buffers.
|
||||||
|
|
||||||
|
Empty flush buffers are legitimate and may happen e.g. due to $r->flush()
|
||||||
|
calls in embedded perl. If there are no data buffered in zlib deflate()
|
||||||
|
will return Z_BUF_ERROR (i.e. no progress possible) without adding anything
|
||||||
|
to output. Don't treat Z_BUF_ERROR as fatal and correctly send empty flush
|
||||||
|
buffer if we have no data in output at all.
|
||||||
|
|
||||||
|
See this thread for details:
|
||||||
|
http://mailman.nginx.org/pipermail/nginx/2010-November/023693.html
|
||||||
|
|
||||||
|
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
|
||||||
|
--- a/src/http/modules/ngx_http_gzip_filter_module.c
|
||||||
|
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
|
||||||
|
@@ -758,6 +758,7 @@ static ngx_int_t
|
||||||
|
ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
|
||||||
|
{
|
||||||
|
int rc;
|
||||||
|
+ ngx_buf_t *b;
|
||||||
|
ngx_chain_t *cl;
|
||||||
|
ngx_http_gzip_conf_t *conf;
|
||||||
|
|
||||||
|
@@ -769,7 +770,7 @@ ngx_http_gzip_filter_deflate(ngx_http_re
|
||||||
|
|
||||||
|
rc = deflate(&ctx->zstream, ctx->flush);
|
||||||
|
|
||||||
|
- if (rc != Z_OK && rc != Z_STREAM_END) {
|
||||||
|
+ if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) {
|
||||||
|
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
|
||||||
|
"deflate() failed: %d, %d", ctx->flush, rc);
|
||||||
|
return NGX_ERROR;
|
||||||
|
@@ -818,8 +819,6 @@ ngx_http_gzip_filter_deflate(ngx_http_re
|
||||||
|
|
||||||
|
if (ctx->flush == Z_SYNC_FLUSH) {
|
||||||
|
|
||||||
|
- ctx->zstream.avail_out = 0;
|
||||||
|
- ctx->out_buf->flush = 1;
|
||||||
|
ctx->flush = Z_NO_FLUSH;
|
||||||
|
|
||||||
|
cl = ngx_alloc_chain_link(r->pool);
|
||||||
|
@@ -827,7 +826,22 @@ ngx_http_gzip_filter_deflate(ngx_http_re
|
||||||
|
return NGX_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
- cl->buf = ctx->out_buf;
|
||||||
|
+ b = ctx->out_buf;
|
||||||
|
+
|
||||||
|
+ if (ngx_buf_size(b) == 0) {
|
||||||
|
+
|
||||||
|
+ b = ngx_calloc_buf(ctx->request->pool);
|
||||||
|
+ if (b == NULL) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ } else {
|
||||||
|
+ ctx->zstream.avail_out = 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ b->flush = 1;
|
||||||
|
+
|
||||||
|
+ cl->buf = b;
|
||||||
|
cl->next = NULL;
|
||||||
|
*ctx->last_out = cl;
|
||||||
|
ctx->last_out = &cl->next;
|
24
patches/nginx-1.1.5-no_Werror.patch
Normal file
24
patches/nginx-1.1.5-no_Werror.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -ur nginx-1.1.5/auto/cc/gcc nginx-1.1.5-patched/auto/cc/gcc
|
||||||
|
--- nginx-1.1.5/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800
|
||||||
|
+++ nginx-1.1.5-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-1.1.5/auto/cc/icc nginx-1.1.5-patched/auto/cc/icc
|
||||||
|
--- nginx-1.1.5/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800
|
||||||
|
+++ nginx-1.1.5-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"
|
90
patches/nginx-1.1.5-no_error_pages.patch
Normal file
90
patches/nginx-1.1.5-no_error_pages.patch
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
--- nginx-1.1.5/src/http/ngx_http_core_module.c 2010-12-14 18:38:42.000000000 +0800
|
||||||
|
+++ nginx-1.1.5-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;
|
504
patches/nginx-1.1.5-no_pool.patch
Normal file
504
patches/nginx-1.1.5-no_pool.patch
Normal file
@ -0,0 +1,504 @@
|
|||||||
|
diff -ur nginx-1.1.5/src/core/nginx.h nginx-1.1.5-patched/src/core/nginx.h
|
||||||
|
--- nginx-1.1.5/src/core/nginx.h 2011-08-29 17:30:22.000000000 +0800
|
||||||
|
+++ nginx-1.1.5-patched/src/core/nginx.h 2011-09-13 12:11:03.135622101 +0800
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
#define nginx_version 1001005
|
||||||
|
#define NGINX_VERSION "1.1.5"
|
||||||
|
-#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown"
|
||||||
|
+#define NGINX_VER "ngx_openresty/" NGINX_VERSION ".unknown (no pool)"
|
||||||
|
|
||||||
|
#define NGINX_VAR "NGINX"
|
||||||
|
diff -ur nginx-1.1.5/src/core/ngx_array.c nginx-1.1.5-patched/src/core/ngx_array.c
|
||||||
|
--- nginx-1.1.5/src/core/ngx_array.c 2008-06-17 23:00:30.000000000 +0800
|
||||||
|
+++ nginx-1.1.5-patched/src/core/ngx_array.c 2011-09-14 12:02:56.263128538 +0800
|
||||||
|
@@ -39,13 +39,7 @@
|
||||||
|
|
||||||
|
p = a->pool;
|
||||||
|
|
||||||
|
- if ((u_char *) a->elts + a->size * a->nalloc == p->d.last) {
|
||||||
|
- p->d.last -= a->size * a->nalloc;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if ((u_char *) a + sizeof(ngx_array_t) == p->d.last) {
|
||||||
|
- p->d.last = (u_char *) a;
|
||||||
|
- }
|
||||||
|
+ ngx_pfree(p, a);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -64,29 +58,17 @@
|
||||||
|
|
||||||
|
p = a->pool;
|
||||||
|
|
||||||
|
- if ((u_char *) a->elts + size == p->d.last
|
||||||
|
- && p->d.last + a->size <= p->d.end)
|
||||||
|
- {
|
||||||
|
- /*
|
||||||
|
- * the array allocation is the last in the pool
|
||||||
|
- * and there is space for new allocation
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- p->d.last += a->size;
|
||||||
|
- a->nalloc++;
|
||||||
|
-
|
||||||
|
- } else {
|
||||||
|
- /* allocate a new array */
|
||||||
|
-
|
||||||
|
- new = ngx_palloc(p, 2 * size);
|
||||||
|
- if (new == NULL) {
|
||||||
|
- return NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- ngx_memcpy(new, a->elts, size);
|
||||||
|
- a->elts = new;
|
||||||
|
- a->nalloc *= 2;
|
||||||
|
+ /* allocate a new array */
|
||||||
|
+
|
||||||
|
+ new = ngx_palloc(p, 2 * size);
|
||||||
|
+ if (new == NULL) {
|
||||||
|
+ return NULL;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ ngx_memcpy(new, a->elts, size);
|
||||||
|
+ a->elts = new;
|
||||||
|
+ a->nalloc *= 2;
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
elt = (u_char *) a->elts + a->size * a->nelts;
|
||||||
|
@@ -100,43 +82,25 @@
|
||||||
|
ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
|
||||||
|
{
|
||||||
|
void *elt, *new;
|
||||||
|
- size_t size;
|
||||||
|
ngx_uint_t nalloc;
|
||||||
|
ngx_pool_t *p;
|
||||||
|
|
||||||
|
- size = n * a->size;
|
||||||
|
-
|
||||||
|
if (a->nelts + n > a->nalloc) {
|
||||||
|
|
||||||
|
/* the array is full */
|
||||||
|
|
||||||
|
p = a->pool;
|
||||||
|
|
||||||
|
- if ((u_char *) a->elts + a->size * a->nalloc == p->d.last
|
||||||
|
- && p->d.last + size <= p->d.end)
|
||||||
|
- {
|
||||||
|
- /*
|
||||||
|
- * the array allocation is the last in the pool
|
||||||
|
- * and there is space for new allocation
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- p->d.last += size;
|
||||||
|
- a->nalloc += n;
|
||||||
|
-
|
||||||
|
- } else {
|
||||||
|
- /* allocate a new array */
|
||||||
|
-
|
||||||
|
- nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
|
||||||
|
-
|
||||||
|
- new = ngx_palloc(p, nalloc * a->size);
|
||||||
|
- if (new == NULL) {
|
||||||
|
- return NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- ngx_memcpy(new, a->elts, a->nelts * a->size);
|
||||||
|
- a->elts = new;
|
||||||
|
- a->nalloc = nalloc;
|
||||||
|
+ nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
|
||||||
|
+
|
||||||
|
+ new = ngx_palloc(p, nalloc * a->size);
|
||||||
|
+ if (new == NULL) {
|
||||||
|
+ return NULL;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ ngx_memcpy(new, a->elts, a->nelts * a->size);
|
||||||
|
+ a->elts = new;
|
||||||
|
+ a->nalloc = nalloc;
|
||||||
|
}
|
||||||
|
|
||||||
|
elt = (u_char *) a->elts + a->size * a->nelts;
|
||||||
|
diff -ur nginx-1.1.5/src/core/ngx_palloc.c nginx-1.1.5-patched/src/core/ngx_palloc.c
|
||||||
|
--- nginx-1.1.5/src/core/ngx_palloc.c 2009-12-17 20:25:46.000000000 +0800
|
||||||
|
+++ nginx-1.1.5-patched/src/core/ngx_palloc.c 2011-09-14 12:03:41.663126519 +0800
|
||||||
|
@@ -8,24 +8,31 @@
|
||||||
|
#include <ngx_core.h>
|
||||||
|
|
||||||
|
|
||||||
|
-static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
|
||||||
|
static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
|
||||||
|
|
||||||
|
|
||||||
|
ngx_pool_t *
|
||||||
|
ngx_create_pool(size_t size, ngx_log_t *log)
|
||||||
|
{
|
||||||
|
- ngx_pool_t *p;
|
||||||
|
+ ngx_pool_t *p;
|
||||||
|
+ ngx_pool_data_t *d;
|
||||||
|
|
||||||
|
- p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
|
||||||
|
+ size = sizeof(ngx_pool_t);
|
||||||
|
+ p = ngx_alloc(size, log);
|
||||||
|
if (p == NULL) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- p->d.last = (u_char *) p + sizeof(ngx_pool_t);
|
||||||
|
- p->d.end = (u_char *) p + size;
|
||||||
|
- p->d.next = NULL;
|
||||||
|
- p->d.failed = 0;
|
||||||
|
+ d = ngx_alloc(sizeof(ngx_pool_data_t), log);
|
||||||
|
+
|
||||||
|
+ if (d == NULL) {
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ d->next = d;
|
||||||
|
+ d->prev = d;
|
||||||
|
+ d->alloc = NULL;
|
||||||
|
+ p->d = d;
|
||||||
|
|
||||||
|
size = size - sizeof(ngx_pool_t);
|
||||||
|
p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
|
||||||
|
@@ -43,7 +50,7 @@
|
||||||
|
void
|
||||||
|
ngx_destroy_pool(ngx_pool_t *pool)
|
||||||
|
{
|
||||||
|
- ngx_pool_t *p, *n;
|
||||||
|
+ ngx_pool_data_t *d, *n;
|
||||||
|
ngx_pool_large_t *l;
|
||||||
|
ngx_pool_cleanup_t *c;
|
||||||
|
|
||||||
|
@@ -55,7 +62,7 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- for (l = pool->large; l; l = l->next) {
|
||||||
|
+ for (l = pool->large; l ; l = l->next) {
|
||||||
|
|
||||||
|
ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
|
||||||
|
|
||||||
|
@@ -71,34 +78,45 @@
|
||||||
|
* so we can not use this log while the free()ing the pool
|
||||||
|
*/
|
||||||
|
|
||||||
|
- for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
|
||||||
|
+ for (d = pool->d, n = d->next; ; d = n, n = n->next) {
|
||||||
|
ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
|
||||||
|
- "free: %p, unused: %uz", p, p->d.end - p->d.last);
|
||||||
|
+ "free: %p", d);
|
||||||
|
|
||||||
|
- if (n == NULL) {
|
||||||
|
+ if (n == pool->d) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
+ if (pool->d->next == pool->d) {
|
||||||
|
+ ngx_free(pool->d);
|
||||||
|
+ } else {
|
||||||
|
+ for (d = pool->d, n = d->next; ; d = n, n = n->next) {
|
||||||
|
+ if (d->alloc) {
|
||||||
|
+ ngx_free(d->alloc);
|
||||||
|
+ }
|
||||||
|
+ ngx_free(d);
|
||||||
|
|
||||||
|
- for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
|
||||||
|
- ngx_free(p);
|
||||||
|
-
|
||||||
|
- if (n == NULL) {
|
||||||
|
- break;
|
||||||
|
+ if (n == pool->d) {
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ ngx_free(pool);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
ngx_reset_pool(ngx_pool_t *pool)
|
||||||
|
{
|
||||||
|
- ngx_pool_t *p;
|
||||||
|
- ngx_pool_large_t *l;
|
||||||
|
+ ngx_pool_data_t *p, *tmp;
|
||||||
|
+ ngx_pool_large_t *l;
|
||||||
|
+
|
||||||
|
+ for (l = pool->large; l ; l = l->next) {
|
||||||
|
+
|
||||||
|
+ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
|
||||||
|
|
||||||
|
- for (l = pool->large; l; l = l->next) {
|
||||||
|
if (l->alloc) {
|
||||||
|
ngx_free(l->alloc);
|
||||||
|
}
|
||||||
|
@@ -106,109 +124,65 @@
|
||||||
|
|
||||||
|
pool->large = NULL;
|
||||||
|
|
||||||
|
- for (p = pool; p; p = p->d.next) {
|
||||||
|
- p->d.last = (u_char *) p + sizeof(ngx_pool_t);
|
||||||
|
+ p = pool->d->next;
|
||||||
|
+ while (p != pool->d) {
|
||||||
|
+ tmp = p;
|
||||||
|
+ ngx_free(p->alloc);
|
||||||
|
+ p->prev->next = p->next;
|
||||||
|
+ p->next->prev = p->prev;
|
||||||
|
+ p = p->next;
|
||||||
|
+ ngx_free(tmp);
|
||||||
|
}
|
||||||
|
-}
|
||||||
|
|
||||||
|
+ ngx_free(pool->d->alloc);
|
||||||
|
+ pool->d->alloc = NULL;
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
|
||||||
|
void *
|
||||||
|
-ngx_palloc(ngx_pool_t *pool, size_t size)
|
||||||
|
+ngx_malloc(ngx_pool_t *pool, size_t size)
|
||||||
|
{
|
||||||
|
- u_char *m;
|
||||||
|
- ngx_pool_t *p;
|
||||||
|
-
|
||||||
|
- if (size <= pool->max) {
|
||||||
|
+ ngx_pool_data_t *new;
|
||||||
|
+ void *m;
|
||||||
|
|
||||||
|
- p = pool->current;
|
||||||
|
-
|
||||||
|
- do {
|
||||||
|
- m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
|
||||||
|
-
|
||||||
|
- if ((size_t) (p->d.end - m) >= size) {
|
||||||
|
- p->d.last = m + size;
|
||||||
|
-
|
||||||
|
- return m;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- p = p->d.next;
|
||||||
|
-
|
||||||
|
- } while (p);
|
||||||
|
+ m = ngx_alloc(size, pool->log);
|
||||||
|
+ if (m == NULL) {
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- return ngx_palloc_block(pool, size);
|
||||||
|
+ new = ngx_alloc(sizeof(ngx_pool_data_t), pool->log);
|
||||||
|
+ if (new == NULL){
|
||||||
|
+ ngx_free(m);
|
||||||
|
+ return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- return ngx_palloc_large(pool, size);
|
||||||
|
+ new->alloc = m;
|
||||||
|
+ new->next = pool->d;
|
||||||
|
+ new->prev = pool->d->prev;
|
||||||
|
+ pool->d->prev->next = new;
|
||||||
|
+ pool->d->prev = new;
|
||||||
|
+ return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
void *
|
||||||
|
-ngx_pnalloc(ngx_pool_t *pool, size_t size)
|
||||||
|
+ngx_palloc(ngx_pool_t *pool, size_t size)
|
||||||
|
{
|
||||||
|
- u_char *m;
|
||||||
|
- ngx_pool_t *p;
|
||||||
|
-
|
||||||
|
- if (size <= pool->max) {
|
||||||
|
-
|
||||||
|
- p = pool->current;
|
||||||
|
-
|
||||||
|
- do {
|
||||||
|
- m = p->d.last;
|
||||||
|
-
|
||||||
|
- if ((size_t) (p->d.end - m) >= size) {
|
||||||
|
- p->d.last = m + size;
|
||||||
|
-
|
||||||
|
- return m;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- p = p->d.next;
|
||||||
|
-
|
||||||
|
- } while (p);
|
||||||
|
-
|
||||||
|
- return ngx_palloc_block(pool, size);
|
||||||
|
+ if (size <= 1024) {
|
||||||
|
+ return ngx_malloc(pool, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ngx_palloc_large(pool, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-static void *
|
||||||
|
-ngx_palloc_block(ngx_pool_t *pool, size_t size)
|
||||||
|
+void *
|
||||||
|
+ngx_pnalloc(ngx_pool_t *pool, size_t size)
|
||||||
|
{
|
||||||
|
- u_char *m;
|
||||||
|
- size_t psize;
|
||||||
|
- ngx_pool_t *p, *new, *current;
|
||||||
|
-
|
||||||
|
- psize = (size_t) (pool->d.end - (u_char *) pool);
|
||||||
|
-
|
||||||
|
- m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
|
||||||
|
- if (m == NULL) {
|
||||||
|
- return NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- new = (ngx_pool_t *) m;
|
||||||
|
-
|
||||||
|
- new->d.end = m + psize;
|
||||||
|
- new->d.next = NULL;
|
||||||
|
- new->d.failed = 0;
|
||||||
|
-
|
||||||
|
- m += sizeof(ngx_pool_data_t);
|
||||||
|
- m = ngx_align_ptr(m, NGX_ALIGNMENT);
|
||||||
|
- new->d.last = m + size;
|
||||||
|
-
|
||||||
|
- current = pool->current;
|
||||||
|
-
|
||||||
|
- for (p = current; p->d.next; p = p->d.next) {
|
||||||
|
- if (p->d.failed++ > 4) {
|
||||||
|
- current = p->d.next;
|
||||||
|
- }
|
||||||
|
+ if (size <= 1024) {
|
||||||
|
+ return ngx_malloc(pool, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
- p->d.next = new;
|
||||||
|
-
|
||||||
|
- pool->current = current ? current : new;
|
||||||
|
-
|
||||||
|
- return m;
|
||||||
|
+ return ngx_palloc_large(pool, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -216,7 +190,6 @@
|
||||||
|
ngx_palloc_large(ngx_pool_t *pool, size_t size)
|
||||||
|
{
|
||||||
|
void *p;
|
||||||
|
- ngx_uint_t n;
|
||||||
|
ngx_pool_large_t *large;
|
||||||
|
|
||||||
|
p = ngx_alloc(size, pool->log);
|
||||||
|
@@ -224,20 +197,7 @@
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- n = 0;
|
||||||
|
-
|
||||||
|
- for (large = pool->large; large; large = large->next) {
|
||||||
|
- if (large->alloc == NULL) {
|
||||||
|
- large->alloc = p;
|
||||||
|
- return p;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (n++ > 3) {
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
|
||||||
|
+ large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
|
||||||
|
if (large == NULL) {
|
||||||
|
ngx_free(p);
|
||||||
|
return NULL;
|
||||||
|
@@ -262,7 +222,7 @@
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
|
||||||
|
+ large = ngx_malloc(pool, sizeof(ngx_pool_large_t));
|
||||||
|
if (large == NULL) {
|
||||||
|
ngx_free(p);
|
||||||
|
return NULL;
|
||||||
|
@@ -279,17 +239,41 @@
|
||||||
|
ngx_int_t
|
||||||
|
ngx_pfree(ngx_pool_t *pool, void *p)
|
||||||
|
{
|
||||||
|
- ngx_pool_large_t *l;
|
||||||
|
+ ngx_pool_large_t *l;
|
||||||
|
+ ngx_pool_large_t *ll;
|
||||||
|
+ ngx_pool_data_t *d, *n;
|
||||||
|
|
||||||
|
- for (l = pool->large; l; l = l->next) {
|
||||||
|
+ for (l = pool->large, ll = l; l; ll = l, l = l->next) {
|
||||||
|
if (p == l->alloc) {
|
||||||
|
ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
|
||||||
|
"free: %p", l->alloc);
|
||||||
|
ngx_free(l->alloc);
|
||||||
|
l->alloc = NULL;
|
||||||
|
+ if (l == pool->large) {
|
||||||
|
+ pool->large = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ll->next = l->next;
|
||||||
|
+ p = l;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
+ for (d = pool->d, n = d->next; ; d = n, n = d->next) {
|
||||||
|
+ if (p == d->alloc) {
|
||||||
|
+ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", d->alloc);
|
||||||
|
+ if (d->alloc) {
|
||||||
|
+ ngx_free(d->alloc);
|
||||||
|
+ }
|
||||||
|
+ d->alloc = NULL;
|
||||||
|
+ d->prev->next = d->next;
|
||||||
|
+ d->next->prev = d->prev;
|
||||||
|
+ ngx_free(d);
|
||||||
|
return NGX_OK;
|
||||||
|
}
|
||||||
|
+ if (d->next == pool->d) {
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
return NGX_DECLINED;
|
||||||
|
diff -ur nginx-1.1.5/src/core/ngx_palloc.h nginx-1.1.5-patched/src/core/ngx_palloc.h
|
||||||
|
--- nginx-1.1.5/src/core/ngx_palloc.h 2009-12-17 20:25:46.000000000 +0800
|
||||||
|
+++ nginx-1.1.5-patched/src/core/ngx_palloc.h 2011-09-13 12:11:03.155622101 +0800
|
||||||
|
@@ -38,6 +38,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct ngx_pool_large_s ngx_pool_large_t;
|
||||||
|
+typedef struct ngx_pool_data_s ngx_pool_data_t;
|
||||||
|
|
||||||
|
struct ngx_pool_large_s {
|
||||||
|
ngx_pool_large_t *next;
|
||||||
|
@@ -45,16 +46,15 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
-typedef struct {
|
||||||
|
- u_char *last;
|
||||||
|
- u_char *end;
|
||||||
|
- ngx_pool_t *next;
|
||||||
|
- ngx_uint_t failed;
|
||||||
|
-} ngx_pool_data_t;
|
||||||
|
+struct ngx_pool_data_s{
|
||||||
|
+ ngx_pool_data_t *next;
|
||||||
|
+ ngx_pool_data_t *prev;
|
||||||
|
+ void *alloc;
|
||||||
|
+};
|
||||||
|
|
||||||
|
|
||||||
|
struct ngx_pool_s {
|
||||||
|
- ngx_pool_data_t d;
|
||||||
|
+ ngx_pool_data_t *d;
|
||||||
|
size_t max;
|
||||||
|
ngx_pool_t *current;
|
||||||
|
ngx_chain_t *chain;
|
27
patches/nginx-1.1.5-request_body_in_single_buf.patch
Normal file
27
patches/nginx-1.1.5-request_body_in_single_buf.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Maxim Dounin <mdounin@mdounin.ru>
|
||||||
|
# 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;
|
||||||
|
}
|
||||||
|
|
17
patches/nginx-1.1.5-request_body_preread_fix.patch
Normal file
17
patches/nginx-1.1.5-request_body_preread_fix.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Maxim Dounin <mdounin@mdounin.ru>
|
||||||
|
# Date 1309776931 -14400
|
||||||
|
# Node ID e7b2f945d55ae44a2295facf9e3336dc4633e5b5
|
||||||
|
# Parent 610e909bb9e29766188aa86fae3abe0bd3432940
|
||||||
|
Core: fix body if it's preread and there are extra data.
|
||||||
|
|
||||||
|
--- nginx-1.1.5/src/http/ngx_http_request_body.c 2011-07-05 12:11:21.619264633 +0800
|
||||||
|
+++ nginx-1.1.5-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;
|
||||||
|
|
26
patches/nginx-1.1.5-server_header.patch
Normal file
26
patches/nginx-1.1.5-server_header.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff -ur lz-nginx-1.1.5/nginx-1.1.5/src/core/nginx.h lz-nginx-1.1.5-patched/nginx-1.1.5/src/core/nginx.h
|
||||||
|
--- lz-nginx-1.1.5/nginx-1.1.5/src/core/nginx.h 2010-02-12 17:31:01.000000000 +0800
|
||||||
|
+++ lz-nginx-1.1.5-patched/nginx-1.1.5/src/core/nginx.h 2010-03-30 10:52:13.240702627 +0800
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
#define nginx_version 1001005
|
||||||
|
#define NGINX_VERSION "1.1.5"
|
||||||
|
-#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.1.5-patched/nginx-1.1.5/src/core: nginx.h.orig
|
||||||
|
Only in lz-nginx-1.1.5-patched/nginx-1.1.5/src/core: nginx.h.rej
|
||||||
|
diff -ur lz-nginx-1.1.5/nginx-1.1.5/src/http/ngx_http_header_filter_module.c lz-nginx-1.1.5-patched/nginx-1.1.5/src/http/ngx_http_header_filter_module.c
|
||||||
|
--- lz-nginx-1.1.5/nginx-1.1.5/src/http/ngx_http_header_filter_module.c 2010-03-03 23:14:04.000000000 +0800
|
||||||
|
+++ lz-nginx-1.1.5-patched/nginx-1.1.5/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;
|
||||||
|
|
||||||
|
|
40
patches/nginx-1.1.5-subrequest_loop.patch
Normal file
40
patches/nginx-1.1.5-subrequest_loop.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Maxim Dounin <mdounin@mdounin.ru>
|
||||||
|
# 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) {
|
||||||
|
|
73
patches/nginx-1.1.5-variable_header_ignore_no_hash.patch
Normal file
73
patches/nginx-1.1.5-variable_header_ignore_no_hash.patch
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
--- nginx-1.1.5/src/http/ngx_http_variables.c 2011-05-30 20:36:17.000000000 +0800
|
||||||
|
+++ nginx-1.1.5-patched/src/http/ngx_http_variables.c 2011-11-08 22:21:55.229247198 +0800
|
||||||
|
@@ -648,7 +648,17 @@
|
||||||
|
|
||||||
|
a = (ngx_array_t *) ((char *) r + data);
|
||||||
|
|
||||||
|
- n = a->nelts;
|
||||||
|
+ h = a->elts;
|
||||||
|
+ n = 0;
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < a->nelts; i++) {
|
||||||
|
+
|
||||||
|
+ if (h[i]->hash == 0) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ n++;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (n == 0) {
|
||||||
|
v->not_found = 1;
|
||||||
|
@@ -659,9 +669,7 @@
|
||||||
|
v->no_cacheable = 0;
|
||||||
|
v->not_found = 0;
|
||||||
|
|
||||||
|
- h = a->elts;
|
||||||
|
-
|
||||||
|
- if (n == 1) {
|
||||||
|
+ if (n == 1 && a->nelts == 1) {
|
||||||
|
v->len = (*h)->value.len;
|
||||||
|
v->data = (*h)->value.data;
|
||||||
|
|
||||||
|
@@ -670,7 +678,12 @@
|
||||||
|
|
||||||
|
len = - (ssize_t) (sizeof("; ") - 1);
|
||||||
|
|
||||||
|
- for (i = 0; i < n; i++) {
|
||||||
|
+ for (i = 0; i < a->nelts; i++) {
|
||||||
|
+
|
||||||
|
+ if (h[i]->hash == 0) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
len += h[i]->value.len + sizeof("; ") - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -683,9 +696,14 @@
|
||||||
|
v->data = p;
|
||||||
|
|
||||||
|
for (i = 0; /* void */ ; i++) {
|
||||||
|
+
|
||||||
|
+ if (h[i]->hash == 0) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
p = ngx_copy(p, h[i]->value.data, h[i]->value.len);
|
||||||
|
|
||||||
|
- if (i == n - 1) {
|
||||||
|
+ if (--n == 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -738,6 +756,10 @@
|
||||||
|
i = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (header[i].hash == 0) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
for (n = 0; n + prefix < var->len && n < header[i].key.len; n++) {
|
||||||
|
ch = header[i].key.data[n];
|
||||||
|
|
1209
t/sanity.t
1209
t/sanity.t
File diff suppressed because it is too large
Load Diff
41
util/configure
vendored
41
util/configure
vendored
@ -59,7 +59,6 @@ my @modules = (
|
|||||||
[http_iconv => 'iconv-nginx-module', 'disabled'],
|
[http_iconv => 'iconv-nginx-module', 'disabled'],
|
||||||
[http_echo => 'echo-nginx-module'],
|
[http_echo => 'echo-nginx-module'],
|
||||||
[http_xss => 'xss-nginx-module'],
|
[http_xss => 'xss-nginx-module'],
|
||||||
[http_coolkit => 'ngx_coolkit'],
|
|
||||||
[http_set_misc => 'set-misc-nginx-module'],
|
[http_set_misc => 'set-misc-nginx-module'],
|
||||||
[http_form_input => 'form-input-nginx-module'],
|
[http_form_input => 'form-input-nginx-module'],
|
||||||
[http_encrypted_session => 'encrypted-session-nginx-module'],
|
[http_encrypted_session => 'encrypted-session-nginx-module'],
|
||||||
@ -71,7 +70,6 @@ my @modules = (
|
|||||||
[http_array_var => 'array-var-nginx-module'],
|
[http_array_var => 'array-var-nginx-module'],
|
||||||
[http_memc => 'memc-nginx-module'],
|
[http_memc => 'memc-nginx-module'],
|
||||||
[http_redis2 => 'redis2-nginx-module'],
|
[http_redis2 => 'redis2-nginx-module'],
|
||||||
[http_upstream_keepalive => 'upstream-keepalive-nginx-module'],
|
|
||||||
[http_auth_request => 'auth-request-nginx-module'],
|
[http_auth_request => 'auth-request-nginx-module'],
|
||||||
[http_rds_json => 'rds-json-nginx-module'],
|
[http_rds_json => 'rds-json-nginx-module'],
|
||||||
[http_rds_csv => 'rds-csv-nginx-module'],
|
[http_rds_csv => 'rds-csv-nginx-module'],
|
||||||
@ -155,21 +153,6 @@ for my $opt (@ARGV) {
|
|||||||
} elsif ($opt eq '--without-lua_redis_parser') {
|
} elsif ($opt eq '--without-lua_redis_parser') {
|
||||||
$resty_opts{no_lua_redis_parser} = 1;
|
$resty_opts{no_lua_redis_parser} = 1;
|
||||||
|
|
||||||
} elsif ($opt eq '--without-lua_resty_memcached') {
|
|
||||||
$resty_opts{no_lua_resty_memcached} = 1;
|
|
||||||
|
|
||||||
} elsif ($opt eq '--without-lua_resty_redis') {
|
|
||||||
$resty_opts{no_lua_resty_redis} = 1;
|
|
||||||
|
|
||||||
} elsif ($opt eq '--without-lua_resty_mysql') {
|
|
||||||
$resty_opts{no_lua_resty_mysql} = 1;
|
|
||||||
|
|
||||||
} elsif ($opt eq '--without-lua_resty_upload') {
|
|
||||||
$resty_opts{no_lua_resty_upload} = 1;
|
|
||||||
|
|
||||||
} elsif ($opt eq '--without-lua_resty_string') {
|
|
||||||
$resty_opts{no_lua_resty_string} = 1;
|
|
||||||
|
|
||||||
} elsif ($opt eq '--without-lua_rds_parser') {
|
} elsif ($opt eq '--without-lua_rds_parser') {
|
||||||
$resty_opts{no_lua_rds_parser} = 1;
|
$resty_opts{no_lua_rds_parser} = 1;
|
||||||
|
|
||||||
@ -510,8 +493,7 @@ _END_
|
|||||||
my $extra_opts = ' TARGET_STRIP=@:';
|
my $extra_opts = ' TARGET_STRIP=@:';
|
||||||
|
|
||||||
if ($opts->{debug}) {
|
if ($opts->{debug}) {
|
||||||
$extra_opts = q{ CCDEBUG=-g Q= XCFLAGS='-DLUA_USE_APICHECK}
|
$extra_opts = ' CCDEBUG=-g Q=';
|
||||||
.q{ -DLUA_USE_ASSERT'};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($platform =~ /bsd/i) {
|
if ($platform =~ /bsd/i) {
|
||||||
@ -763,22 +745,6 @@ _EOC_
|
|||||||
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
||||||
"\$(MAKE) install$extra_opts";
|
"\$(MAKE) install$extra_opts";
|
||||||
}
|
}
|
||||||
|
|
||||||
for my $key (qw(memcached redis mysql string upload)) {
|
|
||||||
unless ($opts->{"no_lua_resty_$key"}) {
|
|
||||||
my $name = "lua-resty-$key";
|
|
||||||
my $dir = auto_complete $name;
|
|
||||||
if (!defined $dir) {
|
|
||||||
die "No $name found";
|
|
||||||
}
|
|
||||||
|
|
||||||
my $extra_opts = " DESTDIR=\$(DESTDIR) LUA_LIB_DIR=$lualib_prefix"
|
|
||||||
." INSTALL=$root_dir/build/install";
|
|
||||||
|
|
||||||
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
|
||||||
"\$(MAKE) install$extra_opts";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# prepare nginx configure line
|
# prepare nginx configure line
|
||||||
@ -877,11 +843,6 @@ _EOC_
|
|||||||
--without-lua_cjson disable the lua-cjson library
|
--without-lua_cjson disable the lua-cjson library
|
||||||
--without-lua_redis_parser disable the lua-redis-parser library
|
--without-lua_redis_parser disable the lua-redis-parser library
|
||||||
--without-lua_rds_parser disable the lua-rds-parser library
|
--without-lua_rds_parser disable the lua-rds-parser library
|
||||||
--without-lua_resty_memcached disable the lua-resty-memcached library
|
|
||||||
--without-lua_resty_redis disable the lua-resty-redis library
|
|
||||||
--without-lua_resty_mysql disable the lua-resty-mysql library
|
|
||||||
--without-lua_resty_upload disable the lua-resty-upload library
|
|
||||||
--without-lua_resty_string disable the lua-resty-string library
|
|
||||||
|
|
||||||
--without-lua51 disable the bundled Lua 5.1 interpreter
|
--without-lua51 disable the bundled Lua 5.1 interpreter
|
||||||
--with-lua51=PATH specify the external installation of Lua 5.1 by PATH
|
--with-lua51=PATH specify the external installation of Lua 5.1 by PATH
|
||||||
|
@ -42,24 +42,18 @@ patch -p1 < $root/patches/nginx-$main_ver-epoll_check_stale_wev.patch || exit 1
|
|||||||
|
|
||||||
#patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1
|
#patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1
|
||||||
|
|
||||||
echo "INFO: applying the max_subrequests patch...";
|
|
||||||
patch -p1 < $root/patches/nginx-$main_ver-max_subrequests.patch || exit 1
|
|
||||||
|
|
||||||
patch -p1 -l < $root/patches/nginx-$main_ver-subrequest_loop.patch || exit 1
|
patch -p1 -l < $root/patches/nginx-$main_ver-subrequest_loop.patch || exit 1
|
||||||
|
|
||||||
patch -p1 -l < $root/patches/nginx-$main_ver-gzip_empty_flush_buf.patch || exit 1
|
patch -p1 -l < $root/patches/nginx-$main_ver-gzip_empty_flush_buf.patch || exit 1
|
||||||
|
|
||||||
patch -p1 < $root/patches/nginx-$main_ver-variable_header_ignore_no_hash.patch || exit 1
|
#patch -p1 < $root/patches/nginx-$main_ver-variable_header_ignore_no_hash.patch || exit 1
|
||||||
|
|
||||||
patch -p1 < $root/patches/nginx-$main_ver-named_location_clear_mods_ctx.patch || exit 1
|
#patch -p1 < $root/patches/nginx-$main_ver-named_location_clear_mods_ctx.patch || exit 1
|
||||||
|
|
||||||
patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || exit 1
|
patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || exit 1
|
||||||
|
|
||||||
patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1
|
patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1
|
||||||
|
|
||||||
echo "INFO: applying null-character-fixes patch"
|
|
||||||
patch -p0 < $root/patches/nginx-$main_ver-null_character_fixes.patch || exit 1
|
|
||||||
|
|
||||||
#patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1
|
#patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1
|
||||||
|
|
||||||
rm -f *.patch || exit 1
|
rm -f *.patch || exit 1
|
||||||
@ -78,7 +72,7 @@ $root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ve
|
|||||||
tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
|
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
|
||||||
|
|
||||||
ver=0.03rc9
|
ver=0.03rc8
|
||||||
$root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf xss-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf xss-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
|
mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
|
||||||
@ -98,7 +92,7 @@ $root/util/get-tarball "http://github.com/agentzh/rds-json-nginx-module/tarball/
|
|||||||
tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1
|
mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1
|
||||||
|
|
||||||
ver=0.05rc1
|
ver=0.04
|
||||||
$root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v$ver" -O rds-csv-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v$ver" -O rds-csv-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
|
mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
|
||||||
@ -117,7 +111,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.5.0rc19
|
ver=0.4.1rc3
|
||||||
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
|
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
|
||||||
@ -138,7 +132,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.13rc6
|
ver=0.13rc3
|
||||||
$root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
|
mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
|
||||||
@ -152,7 +146,7 @@ mv calio-form-input-nginx-module-* form-input-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.10rc7
|
ver=0.10rc5
|
||||||
$root/util/get-tarball "http://github.com/calio/iconv-nginx-module/tarball/v$ver" -O iconv-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/calio/iconv-nginx-module/tarball/v$ver" -O iconv-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf iconv-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf iconv-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv calio-iconv-nginx-module-* iconv-nginx-module-$ver || exit 1
|
mv calio-iconv-nginx-module-* iconv-nginx-module-$ver || exit 1
|
||||||
@ -166,14 +160,6 @@ mv agentzh-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ver
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
|
|
||||||
ver=0.7
|
|
||||||
$root/util/get-tarball "http://mdounin.ru/files/ngx_http_upstream_keepalive-$ver.tar.gz" -O upstream_keepalive-$ver.tar.gz || exit 1
|
|
||||||
tar -xzf upstream_keepalive-$ver.tar.gz || exit 1
|
|
||||||
mv ngx_http_upstream_keepalive-* upstream-keepalive-nginx-module-$ver || exit 1
|
|
||||||
|
|
||||||
#################################
|
|
||||||
|
|
||||||
ver=0.2
|
ver=0.2
|
||||||
$root/util/get-tarball "http://mdounin.ru/files/ngx_http_auth_request_module-$ver.tar.gz" -O auth_request-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://mdounin.ru/files/ngx_http_auth_request_module-$ver.tar.gz" -O auth_request-$ver.tar.gz || exit 1
|
||||||
tar -xzf auth_request-$ver.tar.gz || exit 1
|
tar -xzf auth_request-$ver.tar.gz || exit 1
|
||||||
@ -181,21 +167,14 @@ mv ngx_http_auth_request_module-* auth-request-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.9
|
ver=0.9rc2
|
||||||
$root/util/get-tarball "https://github.com/FRiCKLE/ngx_postgres/tarball/$ver" -O ngx_postgres-$ver.tar.gz || exit 1
|
$root/util/get-tarball "https://github.com/FRiCKLE/ngx_postgres/tarball/$ver" -O ngx_postgres-$ver.tar.gz || exit 1
|
||||||
tar -xzf ngx_postgres-$ver.tar.gz || exit 1
|
tar -xzf ngx_postgres-$ver.tar.gz || exit 1
|
||||||
mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
|
mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.2rc1
|
ver=0.08rc2
|
||||||
$root/util/get-tarball "https://github.com/FRiCKLE/ngx_coolkit/tarball/$ver" -O ngx_coolkit-$ver.tar.gz || exit 1
|
|
||||||
tar -xzf ngx_coolkit-$ver.tar.gz || exit 1
|
|
||||||
mv FRiCKLE-ngx_coolkit-* ngx_coolkit-$ver || exit 1
|
|
||||||
|
|
||||||
#################################
|
|
||||||
|
|
||||||
ver=0.08rc4
|
|
||||||
$root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
|
mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
|
||||||
@ -206,7 +185,7 @@ ver=5.1.4
|
|||||||
$root/util/get-tarball "http://www.lua.org/ftp/lua-$ver.tar.gz" -O "lua-$ver.tar.gz" || exit 1
|
$root/util/get-tarball "http://www.lua.org/ftp/lua-$ver.tar.gz" -O "lua-$ver.tar.gz" || exit 1
|
||||||
tar -xzf lua-$ver.tar.gz || exit 1
|
tar -xzf lua-$ver.tar.gz || exit 1
|
||||||
|
|
||||||
$root/util/get-tarball "http://agentzh.org/misc/nginx/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1
|
$root/util/get-tarball "http://www.lua.org/ftp/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1
|
||||||
|
|
||||||
cd lua-$ver/src || exit 1
|
cd lua-$ver/src || exit 1
|
||||||
patch -p0 < ../../patch-lua-$ver-4 || exit 1
|
patch -p0 < ../../patch-lua-$ver-4 || exit 1
|
||||||
@ -227,10 +206,9 @@ $root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJI
|
|||||||
tar -xzf LuaJIT-$ver.tar.gz || exit 1
|
tar -xzf LuaJIT-$ver.tar.gz || exit 1
|
||||||
|
|
||||||
cd LuaJIT-$ver || exit 1;
|
cd LuaJIT-$ver || exit 1;
|
||||||
$root/util/get-tarball http://luajit.org/download/beta9_hotfix1.patch -O beta9_hotfix1.patch
|
#$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch
|
||||||
patch -p1 < beta9_hotfix1.patch || exit 1
|
#patch -p1 < beta8_hotfix1.patch || exit 1
|
||||||
rm beta9_hotfix1.patch || exit 1
|
#rm beta8_hotfix1.patch || exit 1
|
||||||
|
|
||||||
cp $root/misc/unwind-generic.h ./unwind.h || exit 1
|
cp $root/misc/unwind-generic.h ./unwind.h || exit 1
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
@ -245,7 +223,7 @@ cd ..
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.09rc7
|
ver=0.09rc5
|
||||||
$root/util/get-tarball "http://github.com/agentzh/lua-redis-parser/tarball/v$ver" -O "lua-redis-parser-$ver.tar.gz" || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/lua-redis-parser/tarball/v$ver" -O "lua-redis-parser-$ver.tar.gz" || exit 1
|
||||||
tar -xzf lua-redis-parser-$ver.tar.gz || exit 1
|
tar -xzf lua-redis-parser-$ver.tar.gz || exit 1
|
||||||
mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1
|
mv agentzh-lua-redis-parser-* lua-redis-parser-$ver || exit 1
|
||||||
@ -259,41 +237,6 @@ mv agentzh-lua-rds-parser-* lua-rds-parser-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.06
|
|
||||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-memcached/tarball/v$ver" -O "lua-resty-memcached-$ver.tar.gz" || exit 1
|
|
||||||
tar -xzf lua-resty-memcached-$ver.tar.gz || exit 1
|
|
||||||
mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
|
|
||||||
|
|
||||||
#################################
|
|
||||||
|
|
||||||
ver=0.08
|
|
||||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
|
|
||||||
tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
|
|
||||||
mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
|
|
||||||
|
|
||||||
#################################
|
|
||||||
|
|
||||||
ver=0.06
|
|
||||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
|
|
||||||
tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
|
|
||||||
mv agentzh-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
|
|
||||||
|
|
||||||
#################################
|
|
||||||
|
|
||||||
ver=0.02
|
|
||||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-upload/tarball/v$ver" -O "lua-resty-upload-$ver.tar.gz" || exit 1
|
|
||||||
tar -xzf lua-resty-upload-$ver.tar.gz || exit 1
|
|
||||||
mv agentzh-lua-resty-upload-* lua-resty-upload-$ver || exit 1
|
|
||||||
|
|
||||||
#################################
|
|
||||||
|
|
||||||
ver=0.05
|
|
||||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-string/tarball/v$ver" -O "lua-resty-string-$ver.tar.gz" || exit 1
|
|
||||||
tar -xzf lua-resty-string-$ver.tar.gz || exit 1
|
|
||||||
mv agentzh-lua-resty-string-* lua-resty-string-$ver || exit 1
|
|
||||||
|
|
||||||
#################################
|
|
||||||
|
|
||||||
rm *.tar.gz
|
rm *.tar.gz
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
Reference in New Issue
Block a user