mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
14 Commits
Author | SHA1 | Date | |
---|---|---|---|
753ef7074b | |||
8c6b0f77af | |||
52962f3fc9 | |||
0e31ce1662 | |||
da90bd7671 | |||
4a80309873 | |||
383901b193 | |||
9bd838251f | |||
e5fd373848 | |||
db38504310 | |||
2351c7c7aa | |||
f3d36df365 | |||
220b940e66 | |||
c0c2f883e9 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -66,6 +66,7 @@ util/blog-rows.sql
|
|||||||
util/comments.sql
|
util/comments.sql
|
||||||
util/posts.sql
|
util/posts.sql
|
||||||
ngx_openresty-*
|
ngx_openresty-*
|
||||||
|
openresty-*
|
||||||
work/
|
work/
|
||||||
reindex
|
reindex
|
||||||
t/*.t_
|
t/*.t_
|
||||||
|
4
Makefile
4
Makefile
@ -7,8 +7,8 @@ test: all
|
|||||||
prove -r t
|
prove -r t
|
||||||
|
|
||||||
try-luajit: all
|
try-luajit: all
|
||||||
cd ngx_openresty-`./util/ver` && ./configure --with-luajit
|
cd openresty-`./util/ver` && ./configure --with-luajit
|
||||||
|
|
||||||
try-lua: all
|
try-lua: all
|
||||||
cd ngx_openresty-`./util/ver` && ./configure && $(MAKE)
|
cd openresty-`./util/ver` && ./configure && $(MAKE)
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Name
|
Name
|
||||||
====
|
====
|
||||||
|
|
||||||
ngx_openresty - Turning Nginx into a Full-Fledged Scriptable Web Platform
|
OpenResty - Turning Nginx into a Full-Fledged Scriptable Web Platform
|
||||||
|
|
||||||
Table of Contents
|
Table of Contents
|
||||||
=================
|
=================
|
||||||
@ -17,7 +17,7 @@ Table of Contents
|
|||||||
Description
|
Description
|
||||||
===========
|
===========
|
||||||
|
|
||||||
ngx_openresty is a full-fledged web application server by bundling the standard nginx core,
|
OpenResty is a full-fledged web application server by bundling the standard nginx core,
|
||||||
lots of 3rd-party nginx modules, as well as most of their external dependencies.
|
lots of 3rd-party nginx modules, as well as most of their external dependencies.
|
||||||
|
|
||||||
This bundle is maintained Yichun Zhang (agentzh).
|
This bundle is maintained Yichun Zhang (agentzh).
|
||||||
@ -40,7 +40,7 @@ For Bundle Maintainers
|
|||||||
|
|
||||||
The bundle's source is at the following git repository:
|
The bundle's source is at the following git repository:
|
||||||
|
|
||||||
https://github.com/openresty/ngx_openresty
|
https://github.com/openresty/openresty
|
||||||
|
|
||||||
To reproduce the bundle tarball, just do
|
To reproduce the bundle tarball, just do
|
||||||
|
|
||||||
@ -79,7 +79,7 @@ Report Bugs
|
|||||||
|
|
||||||
You're very welcome to report issues on GitHub:
|
You're very welcome to report issues on GitHub:
|
||||||
|
|
||||||
https://github.com/agentzh/ngx_openresty/issues
|
https://github.com/openresty/openresty/issues
|
||||||
|
|
||||||
[Back to TOC](#table-of-contents)
|
[Back to TOC](#table-of-contents)
|
||||||
|
|
||||||
@ -88,7 +88,7 @@ Copyright & License
|
|||||||
|
|
||||||
The bundle itself is licensed under the 2-clause BSD license.
|
The bundle itself is licensed under the 2-clause BSD license.
|
||||||
|
|
||||||
Copyright (c) 2011-2015, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
|
Copyright (c) 2011-2016, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
|
||||||
|
|
||||||
This module is licensed under the terms of the BSD license.
|
This module is licensed under the terms of the BSD license.
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@
|
|||||||
<a href="site-binary.tar.gz">Compiled form (.tar.gz)</a>
|
<a href="site-binary.tar.gz">Compiled form (.tar.gz)</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="module-list-item">
|
<li class="module-list-item">
|
||||||
<a target="_blank" href="http://github.com/agentzh/ngx_openresty/tree/master/demo/[% blog_owner == 'agentzh' ? "Blog" : "Blog2" %]/">
|
<a target="_blank" href="http://github.com/openresty/openresty/tree/master/demo/[% blog_owner == 'agentzh' ? "Blog" : "Blog2" %]/">
|
||||||
Source code (Git)
|
Source code (Git)
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
@ -150,10 +150,10 @@ make install
|
|||||||
where the dependency library source tarballs for OpenSSL, Zlib, and PCRE are downloaded
|
where the dependency library source tarballs for OpenSSL, Zlib, and PCRE are downloaded
|
||||||
from their official sites, respectively.
|
from their official sites, respectively.
|
||||||
|
|
||||||
We automate these commands in a dedicated shell script named [build-win32.sh](https://github.com/openresty/ngx_openresty/blob/master/util/build-win32.sh).
|
We automate these commands in a dedicated shell script named [build-win32.sh](https://github.com/openresty/openresty/blob/master/util/build-win32.sh).
|
||||||
|
|
||||||
Furthermore, we automate the packaging process of the resulting binaries and supporting files
|
Furthermore, we automate the packaging process of the resulting binaries and supporting files
|
||||||
with this [package-win32.sh](https://github.com/openresty/ngx_openresty/blob/master/util/package-win32.sh)
|
with this [package-win32.sh](https://github.com/openresty/openresty/blob/master/util/package-win32.sh)
|
||||||
script.
|
script.
|
||||||
|
|
||||||
Usually you can just download and use the binary distribution of OpenResty without
|
Usually you can just download and use the binary distribution of OpenResty without
|
||||||
|
@ -451,21 +451,6 @@ index ef4a647..49bb30b 100644
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/core/ngx_thread_pool.h b/src/core/ngx_thread_pool.h
|
|
||||||
index 5e5adf6..5999525 100644
|
|
||||||
--- a/src/core/ngx_thread_pool.h
|
|
||||||
+++ b/src/core/ngx_thread_pool.h
|
|
||||||
@@ -23,7 +23,10 @@ struct ngx_thread_task_s {
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
+#ifndef NGX_DEFINE_THREAD_POOL_T
|
|
||||||
+#define NGX_DEFINE_THREAD_POOL_T 1
|
|
||||||
typedef struct ngx_thread_pool_s ngx_thread_pool_t;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
|
|
||||||
ngx_thread_pool_t *ngx_thread_pool_add(ngx_conf_t *cf, ngx_str_t *name);
|
|
||||||
diff --git a/src/dtrace/nginx.stp b/src/dtrace/nginx.stp
|
diff --git a/src/dtrace/nginx.stp b/src/dtrace/nginx.stp
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..e824daf
|
index 0000000..e824daf
|
||||||
@ -831,10 +816,10 @@ index 0000000..1bca4cf
|
|||||||
+
|
+
|
||||||
diff --git a/src/event/ngx_event_probe.h b/src/event/ngx_event_probe.h
|
diff --git a/src/event/ngx_event_probe.h b/src/event/ngx_event_probe.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..9fa2a82
|
index 0000000..5aa0397
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/event/ngx_event_probe.h
|
+++ b/src/event/ngx_event_probe.h
|
||||||
@@ -0,0 +1,40 @@
|
@@ -0,0 +1,33 @@
|
||||||
+#ifndef _NGX_EVENT_PROBE_H_INCLUDED_
|
+#ifndef _NGX_EVENT_PROBE_H_INCLUDED_
|
||||||
+#define _NGX_EVENT_PROBE_H_INCLUDED_
|
+#define _NGX_EVENT_PROBE_H_INCLUDED_
|
||||||
+
|
+
|
||||||
@ -846,13 +831,6 @@ index 0000000..9fa2a82
|
|||||||
+
|
+
|
||||||
+#if (NGX_DTRACE)
|
+#if (NGX_DTRACE)
|
||||||
+
|
+
|
||||||
+#if (NGX_THREADS)
|
|
||||||
+# ifndef NGX_DEFINE_THREAD_POOL_T
|
|
||||||
+# define NGX_DEFINE_THREAD_POOL_T 1
|
|
||||||
+typedef struct ngx_thread_pool_s ngx_thread_pool_t;
|
|
||||||
+# endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#include <ngx_http.h>
|
+#include <ngx_http.h>
|
||||||
+#include <ngx_dtrace_provider.h>
|
+#include <ngx_dtrace_provider.h>
|
||||||
+
|
+
|
||||||
@ -876,10 +854,18 @@ index 0000000..9fa2a82
|
|||||||
+
|
+
|
||||||
+#endif /* _NGX_EVENT_PROBE_H_INCLUDED_ */
|
+#endif /* _NGX_EVENT_PROBE_H_INCLUDED_ */
|
||||||
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
|
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
|
||||||
index 8f547b2..e12a51e 100644
|
index 8f547b2..6e77465 100644
|
||||||
--- a/src/event/ngx_event_timer.c
|
--- a/src/event/ngx_event_timer.c
|
||||||
+++ b/src/event/ngx_event_timer.c
|
+++ b/src/event/ngx_event_timer.c
|
||||||
@@ -91,6 +91,8 @@ ngx_event_expire_timers(void)
|
@@ -8,6 +8,7 @@
|
||||||
|
#include <ngx_config.h>
|
||||||
|
#include <ngx_core.h>
|
||||||
|
#include <ngx_event.h>
|
||||||
|
+#include <ngx_event_probe.h>
|
||||||
|
|
||||||
|
|
||||||
|
ngx_rbtree_t ngx_event_timer_rbtree;
|
||||||
|
@@ -91,6 +92,8 @@ ngx_event_expire_timers(void)
|
||||||
|
|
||||||
ev->timedout = 1;
|
ev->timedout = 1;
|
||||||
|
|
||||||
@ -888,32 +874,61 @@ index 8f547b2..e12a51e 100644
|
|||||||
ev->handler(ev);
|
ev->handler(ev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -136,3 +139,19 @@ ngx_event_cancel_timers(void)
|
||||||
|
ev->handler(ev);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+#if (NGX_DTRACE)
|
||||||
|
+void
|
||||||
|
+ngx_event_probe_timer_add_helper(ngx_event_t *ev, ngx_msec_t timer)
|
||||||
|
+{
|
||||||
|
+ ngx_event_probe_timer_add(ev, timer);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+ngx_event_probe_timer_del_helper(ngx_event_t *ev)
|
||||||
|
+{
|
||||||
|
+ ngx_event_probe_timer_del(ev);
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h
|
diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h
|
||||||
index 99f8a48..79c3fa0 100644
|
index 99f8a48..8bc619a 100644
|
||||||
--- a/src/event/ngx_event_timer.h
|
--- a/src/event/ngx_event_timer.h
|
||||||
+++ b/src/event/ngx_event_timer.h
|
+++ b/src/event/ngx_event_timer.h
|
||||||
@@ -12,6 +12,7 @@
|
@@ -25,12 +25,23 @@ void ngx_event_expire_timers(void);
|
||||||
#include <ngx_config.h>
|
void ngx_event_cancel_timers(void);
|
||||||
#include <ngx_core.h>
|
|
||||||
#include <ngx_event.h>
|
|
||||||
+#include <ngx_event_probe.h>
|
+#if (NGX_DTRACE)
|
||||||
|
+void ngx_event_probe_timer_add_helper(ngx_event_t *ev,
|
||||||
|
+ ngx_msec_t timer);
|
||||||
|
+void ngx_event_probe_timer_del_helper(ngx_event_t *ev);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
extern ngx_rbtree_t ngx_event_timer_rbtree;
|
||||||
|
|
||||||
|
|
||||||
#define NGX_TIMER_INFINITE (ngx_msec_t) -1
|
|
||||||
@@ -31,6 +32,8 @@ extern ngx_rbtree_t ngx_event_timer_rbtree;
|
|
||||||
static ngx_inline void
|
static ngx_inline void
|
||||||
ngx_event_del_timer(ngx_event_t *ev)
|
ngx_event_del_timer(ngx_event_t *ev)
|
||||||
{
|
{
|
||||||
+ ngx_event_probe_timer_del(ev);
|
+#if (NGX_DTRACE)
|
||||||
|
+ ngx_event_probe_timer_del_helper(ev);
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
||||||
"event timer del: %d: %M",
|
"event timer del: %d: %M",
|
||||||
ngx_event_ident(ev->data), ev->timer.key);
|
ngx_event_ident(ev->data), ev->timer.key);
|
||||||
@@ -77,6 +80,8 @@ ngx_event_add_timer(ngx_event_t *ev, ngx_msec_t timer)
|
@@ -77,6 +88,10 @@ ngx_event_add_timer(ngx_event_t *ev, ngx_msec_t timer)
|
||||||
|
|
||||||
ev->timer.key = key;
|
ev->timer.key = key;
|
||||||
|
|
||||||
+ ngx_event_probe_timer_add(ev, timer);
|
+#if (NGX_DTRACE)
|
||||||
|
+ ngx_event_probe_timer_add_helper(ev, timer);
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
||||||
"event timer add: %d: %M:%M",
|
"event timer add: %d: %M:%M",
|
||||||
|
565
patches/nginx-1.9.7-resolver_security_fixes.patch
Normal file
565
patches/nginx-1.9.7-resolver_security_fixes.patch
Normal file
@ -0,0 +1,565 @@
|
|||||||
|
diff -upr nginx-1.9.7-old/src/core/ngx_resolver.c nginx-1.9.7/src/core/ngx_resolver.c
|
||||||
|
--- nginx-1.9.7-old/src/core/ngx_resolver.c 2016-01-26 11:54:55.915406799 -0800
|
||||||
|
+++ nginx-1.9.7/src/core/ngx_resolver.c 2016-01-26 11:55:27.067782268 -0800
|
||||||
|
@@ -59,15 +59,15 @@ ngx_int_t ngx_udp_connect(ngx_udp_connec
|
||||||
|
static void ngx_resolver_cleanup(void *data);
|
||||||
|
static void ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree);
|
||||||
|
static ngx_int_t ngx_resolve_name_locked(ngx_resolver_t *r,
|
||||||
|
- ngx_resolver_ctx_t *ctx);
|
||||||
|
+ ngx_resolver_ctx_t *ctx, ngx_str_t *name);
|
||||||
|
static void ngx_resolver_expire(ngx_resolver_t *r, ngx_rbtree_t *tree,
|
||||||
|
ngx_queue_t *queue);
|
||||||
|
static ngx_int_t ngx_resolver_send_query(ngx_resolver_t *r,
|
||||||
|
ngx_resolver_node_t *rn);
|
||||||
|
-static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_node_t *rn,
|
||||||
|
- ngx_resolver_ctx_t *ctx);
|
||||||
|
-static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_node_t *rn,
|
||||||
|
- ngx_resolver_ctx_t *ctx);
|
||||||
|
+static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_t *r,
|
||||||
|
+ ngx_resolver_node_t *rn, ngx_str_t *name);
|
||||||
|
+static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_t *r,
|
||||||
|
+ ngx_resolver_node_t *rn, ngx_addr_t *addr);
|
||||||
|
static void ngx_resolver_resend_handler(ngx_event_t *ev);
|
||||||
|
static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree,
|
||||||
|
ngx_queue_t *queue);
|
||||||
|
@@ -376,7 +376,7 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx
|
||||||
|
|
||||||
|
/* lock name mutex */
|
||||||
|
|
||||||
|
- rc = ngx_resolve_name_locked(r, ctx);
|
||||||
|
+ rc = ngx_resolve_name_locked(r, ctx, &ctx->name);
|
||||||
|
|
||||||
|
if (rc == NGX_OK) {
|
||||||
|
return NGX_OK;
|
||||||
|
@@ -403,7 +403,6 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx
|
||||||
|
void
|
||||||
|
ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
|
||||||
|
{
|
||||||
|
- uint32_t hash;
|
||||||
|
ngx_resolver_t *r;
|
||||||
|
ngx_resolver_ctx_t *w, **p;
|
||||||
|
ngx_resolver_node_t *rn;
|
||||||
|
@@ -423,11 +422,9 @@ ngx_resolve_name_done(ngx_resolver_ctx_t
|
||||||
|
|
||||||
|
/* lock name mutex */
|
||||||
|
|
||||||
|
- if (ctx->state == NGX_AGAIN) {
|
||||||
|
-
|
||||||
|
- hash = ngx_crc32_short(ctx->name.data, ctx->name.len);
|
||||||
|
+ if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) {
|
||||||
|
|
||||||
|
- rn = ngx_resolver_lookup_name(r, &ctx->name, hash);
|
||||||
|
+ rn = ctx->node;
|
||||||
|
|
||||||
|
if (rn) {
|
||||||
|
p = &rn->waiting;
|
||||||
|
@@ -472,23 +469,28 @@ done:
|
||||||
|
|
||||||
|
|
||||||
|
static ngx_int_t
|
||||||
|
-ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
|
||||||
|
+ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
|
||||||
|
+ ngx_str_t *name)
|
||||||
|
{
|
||||||
|
uint32_t hash;
|
||||||
|
ngx_int_t rc;
|
||||||
|
+ ngx_str_t cname;
|
||||||
|
ngx_uint_t naddrs;
|
||||||
|
ngx_addr_t *addrs;
|
||||||
|
- ngx_resolver_ctx_t *next;
|
||||||
|
+ ngx_resolver_ctx_t *next, *last;
|
||||||
|
ngx_resolver_node_t *rn;
|
||||||
|
|
||||||
|
- ngx_strlow(ctx->name.data, ctx->name.data, ctx->name.len);
|
||||||
|
+ ngx_strlow(name->data, name->data, name->len);
|
||||||
|
|
||||||
|
- hash = ngx_crc32_short(ctx->name.data, ctx->name.len);
|
||||||
|
+ hash = ngx_crc32_short(name->data, name->len);
|
||||||
|
|
||||||
|
- rn = ngx_resolver_lookup_name(r, &ctx->name, hash);
|
||||||
|
+ rn = ngx_resolver_lookup_name(r, name, hash);
|
||||||
|
|
||||||
|
if (rn) {
|
||||||
|
|
||||||
|
+ /* ctx can be a list after NGX_RESOLVE_CNAME */
|
||||||
|
+ for (last = ctx; last->next; last = last->next);
|
||||||
|
+
|
||||||
|
if (rn->valid >= ngx_time()) {
|
||||||
|
|
||||||
|
ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
|
||||||
|
@@ -516,7 +518,7 @@ ngx_resolve_name_locked(ngx_resolver_t *
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- ctx->next = rn->waiting;
|
||||||
|
+ last->next = rn->waiting;
|
||||||
|
rn->waiting = NULL;
|
||||||
|
|
||||||
|
/* unlock name mutex */
|
||||||
|
@@ -556,13 +558,13 @@ ngx_resolve_name_locked(ngx_resolver_t *
|
||||||
|
|
||||||
|
if (ctx->recursion++ < NGX_RESOLVER_MAX_RECURSION) {
|
||||||
|
|
||||||
|
- ctx->name.len = rn->cnlen;
|
||||||
|
- ctx->name.data = rn->u.cname;
|
||||||
|
+ cname.len = rn->cnlen;
|
||||||
|
+ cname.data = rn->u.cname;
|
||||||
|
|
||||||
|
- return ngx_resolve_name_locked(r, ctx);
|
||||||
|
+ return ngx_resolve_name_locked(r, ctx, &cname);
|
||||||
|
}
|
||||||
|
|
||||||
|
- ctx->next = rn->waiting;
|
||||||
|
+ last->next = rn->waiting;
|
||||||
|
rn->waiting = NULL;
|
||||||
|
|
||||||
|
/* unlock name mutex */
|
||||||
|
@@ -581,10 +583,29 @@ ngx_resolve_name_locked(ngx_resolver_t *
|
||||||
|
|
||||||
|
if (rn->waiting) {
|
||||||
|
|
||||||
|
- ctx->next = rn->waiting;
|
||||||
|
+ if (ctx->event == NULL) {
|
||||||
|
+ ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
|
||||||
|
+ if (ctx->event == NULL) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ctx->event->handler = ngx_resolver_timeout_handler;
|
||||||
|
+ ctx->event->data = ctx;
|
||||||
|
+ ctx->event->log = r->log;
|
||||||
|
+ ctx->ident = -1;
|
||||||
|
+
|
||||||
|
+ ngx_add_timer(ctx->event, ctx->timeout);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ last->next = rn->waiting;
|
||||||
|
rn->waiting = ctx;
|
||||||
|
ctx->state = NGX_AGAIN;
|
||||||
|
|
||||||
|
+ do {
|
||||||
|
+ ctx->node = rn;
|
||||||
|
+ ctx = ctx->next;
|
||||||
|
+ } while (ctx);
|
||||||
|
+
|
||||||
|
return NGX_AGAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -623,14 +644,14 @@ ngx_resolve_name_locked(ngx_resolver_t *
|
||||||
|
return NGX_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
- rn->name = ngx_resolver_dup(r, ctx->name.data, ctx->name.len);
|
||||||
|
+ rn->name = ngx_resolver_dup(r, name->data, name->len);
|
||||||
|
if (rn->name == NULL) {
|
||||||
|
ngx_resolver_free(r, rn);
|
||||||
|
return NGX_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
rn->node.key = hash;
|
||||||
|
- rn->nlen = (u_short) ctx->name.len;
|
||||||
|
+ rn->nlen = (u_short) name->len;
|
||||||
|
rn->query = NULL;
|
||||||
|
#if (NGX_HAVE_INET6)
|
||||||
|
rn->query6 = NULL;
|
||||||
|
@@ -639,7 +660,7 @@ ngx_resolve_name_locked(ngx_resolver_t *
|
||||||
|
ngx_rbtree_insert(&r->name_rbtree, &rn->node);
|
||||||
|
}
|
||||||
|
|
||||||
|
- rc = ngx_resolver_create_name_query(rn, ctx);
|
||||||
|
+ rc = ngx_resolver_create_name_query(r, rn, name);
|
||||||
|
|
||||||
|
if (rc == NGX_ERROR) {
|
||||||
|
goto failed;
|
||||||
|
@@ -652,8 +673,14 @@ ngx_resolve_name_locked(ngx_resolver_t *
|
||||||
|
ngx_resolver_free(r, rn->name);
|
||||||
|
ngx_resolver_free(r, rn);
|
||||||
|
|
||||||
|
- ctx->state = NGX_RESOLVE_NXDOMAIN;
|
||||||
|
- ctx->handler(ctx);
|
||||||
|
+ do {
|
||||||
|
+ ctx->state = NGX_RESOLVE_NXDOMAIN;
|
||||||
|
+ next = ctx->next;
|
||||||
|
+
|
||||||
|
+ ctx->handler(ctx);
|
||||||
|
+
|
||||||
|
+ ctx = next;
|
||||||
|
+ } while (ctx);
|
||||||
|
|
||||||
|
return NGX_OK;
|
||||||
|
}
|
||||||
|
@@ -674,9 +701,9 @@ ngx_resolve_name_locked(ngx_resolver_t *
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx->event->handler = ngx_resolver_timeout_handler;
|
||||||
|
- ctx->event->data = rn;
|
||||||
|
+ ctx->event->data = ctx;
|
||||||
|
ctx->event->log = r->log;
|
||||||
|
- rn->ident = -1;
|
||||||
|
+ ctx->ident = -1;
|
||||||
|
|
||||||
|
ngx_add_timer(ctx->event, ctx->timeout);
|
||||||
|
}
|
||||||
|
@@ -697,6 +724,11 @@ ngx_resolve_name_locked(ngx_resolver_t *
|
||||||
|
|
||||||
|
ctx->state = NGX_AGAIN;
|
||||||
|
|
||||||
|
+ do {
|
||||||
|
+ ctx->node = rn;
|
||||||
|
+ ctx = ctx->next;
|
||||||
|
+ } while (ctx);
|
||||||
|
+
|
||||||
|
return NGX_AGAIN;
|
||||||
|
|
||||||
|
failed:
|
||||||
|
@@ -804,9 +836,22 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx
|
||||||
|
|
||||||
|
if (rn->waiting) {
|
||||||
|
|
||||||
|
+ ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
|
||||||
|
+ if (ctx->event == NULL) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ctx->event->handler = ngx_resolver_timeout_handler;
|
||||||
|
+ ctx->event->data = ctx;
|
||||||
|
+ ctx->event->log = r->log;
|
||||||
|
+ ctx->ident = -1;
|
||||||
|
+
|
||||||
|
+ ngx_add_timer(ctx->event, ctx->timeout);
|
||||||
|
+
|
||||||
|
ctx->next = rn->waiting;
|
||||||
|
rn->waiting = ctx;
|
||||||
|
ctx->state = NGX_AGAIN;
|
||||||
|
+ ctx->node = rn;
|
||||||
|
|
||||||
|
/* unlock addr mutex */
|
||||||
|
|
||||||
|
@@ -848,7 +893,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx
|
||||||
|
ngx_rbtree_insert(tree, &rn->node);
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (ngx_resolver_create_addr_query(rn, ctx) != NGX_OK) {
|
||||||
|
+ if (ngx_resolver_create_addr_query(r, rn, &ctx->addr) != NGX_OK) {
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -867,9 +912,9 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx->event->handler = ngx_resolver_timeout_handler;
|
||||||
|
- ctx->event->data = rn;
|
||||||
|
+ ctx->event->data = ctx;
|
||||||
|
ctx->event->log = r->log;
|
||||||
|
- rn->ident = -1;
|
||||||
|
+ ctx->ident = -1;
|
||||||
|
|
||||||
|
ngx_add_timer(ctx->event, ctx->timeout);
|
||||||
|
|
||||||
|
@@ -892,6 +937,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx
|
||||||
|
/* unlock addr mutex */
|
||||||
|
|
||||||
|
ctx->state = NGX_AGAIN;
|
||||||
|
+ ctx->node = rn;
|
||||||
|
|
||||||
|
return NGX_OK;
|
||||||
|
|
||||||
|
@@ -922,17 +968,11 @@ failed:
|
||||||
|
void
|
||||||
|
ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
|
||||||
|
{
|
||||||
|
- in_addr_t addr;
|
||||||
|
ngx_queue_t *expire_queue;
|
||||||
|
ngx_rbtree_t *tree;
|
||||||
|
ngx_resolver_t *r;
|
||||||
|
ngx_resolver_ctx_t *w, **p;
|
||||||
|
- struct sockaddr_in *sin;
|
||||||
|
ngx_resolver_node_t *rn;
|
||||||
|
-#if (NGX_HAVE_INET6)
|
||||||
|
- uint32_t hash;
|
||||||
|
- struct sockaddr_in6 *sin6;
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
r = ctx->resolver;
|
||||||
|
|
||||||
|
@@ -959,23 +999,9 @@ ngx_resolve_addr_done(ngx_resolver_ctx_t
|
||||||
|
|
||||||
|
/* lock addr mutex */
|
||||||
|
|
||||||
|
- if (ctx->state == NGX_AGAIN) {
|
||||||
|
-
|
||||||
|
- switch (ctx->addr.sockaddr->sa_family) {
|
||||||
|
-
|
||||||
|
-#if (NGX_HAVE_INET6)
|
||||||
|
- case AF_INET6:
|
||||||
|
- sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr;
|
||||||
|
- hash = ngx_crc32_short(sin6->sin6_addr.s6_addr, 16);
|
||||||
|
- rn = ngx_resolver_lookup_addr6(r, &sin6->sin6_addr, hash);
|
||||||
|
- break;
|
||||||
|
-#endif
|
||||||
|
+ if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) {
|
||||||
|
|
||||||
|
- default: /* AF_INET */
|
||||||
|
- sin = (struct sockaddr_in *) ctx->addr.sockaddr;
|
||||||
|
- addr = ntohl(sin->sin_addr.s_addr);
|
||||||
|
- rn = ngx_resolver_lookup_addr(r, addr);
|
||||||
|
- }
|
||||||
|
+ rn = ctx->node;
|
||||||
|
|
||||||
|
if (rn) {
|
||||||
|
p = &rn->waiting;
|
||||||
|
@@ -1312,7 +1338,7 @@ ngx_resolver_process_response(ngx_resolv
|
||||||
|
times = 0;
|
||||||
|
|
||||||
|
for (q = ngx_queue_head(&r->name_resend_queue);
|
||||||
|
- q != ngx_queue_sentinel(&r->name_resend_queue) || times++ < 100;
|
||||||
|
+ q != ngx_queue_sentinel(&r->name_resend_queue) && times++ < 100;
|
||||||
|
q = ngx_queue_next(q))
|
||||||
|
{
|
||||||
|
rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
|
||||||
|
@@ -1975,20 +2001,39 @@ ngx_resolver_process_a(ngx_resolver_t *r
|
||||||
|
|
||||||
|
ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
|
||||||
|
|
||||||
|
+ ngx_resolver_free(r, rn->query);
|
||||||
|
+ rn->query = NULL;
|
||||||
|
+#if (NGX_HAVE_INET6)
|
||||||
|
+ rn->query6 = NULL;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
ctx = rn->waiting;
|
||||||
|
rn->waiting = NULL;
|
||||||
|
|
||||||
|
if (ctx) {
|
||||||
|
- ctx->name = name;
|
||||||
|
|
||||||
|
- (void) ngx_resolve_name_locked(r, ctx);
|
||||||
|
- }
|
||||||
|
+ if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
|
||||||
|
|
||||||
|
- ngx_resolver_free(r, rn->query);
|
||||||
|
- rn->query = NULL;
|
||||||
|
-#if (NGX_HAVE_INET6)
|
||||||
|
- rn->query6 = NULL;
|
||||||
|
-#endif
|
||||||
|
+ /* unlock name mutex */
|
||||||
|
+
|
||||||
|
+ do {
|
||||||
|
+ ctx->state = NGX_RESOLVE_NXDOMAIN;
|
||||||
|
+ next = ctx->next;
|
||||||
|
+
|
||||||
|
+ ctx->handler(ctx);
|
||||||
|
+
|
||||||
|
+ ctx = next;
|
||||||
|
+ } while (ctx);
|
||||||
|
+
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (next = ctx; next; next = next->next) {
|
||||||
|
+ next->node = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ (void) ngx_resolve_name_locked(r, ctx, &name);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* unlock name mutex */
|
||||||
|
|
||||||
|
@@ -2496,27 +2541,23 @@ ngx_resolver_rbtree_insert_addr6_value(n
|
||||||
|
|
||||||
|
|
||||||
|
static ngx_int_t
|
||||||
|
-ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
|
||||||
|
+ngx_resolver_create_name_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
|
||||||
|
+ ngx_str_t *name)
|
||||||
|
{
|
||||||
|
u_char *p, *s;
|
||||||
|
size_t len, nlen;
|
||||||
|
ngx_uint_t ident;
|
||||||
|
-#if (NGX_HAVE_INET6)
|
||||||
|
- ngx_resolver_t *r;
|
||||||
|
-#endif
|
||||||
|
ngx_resolver_qs_t *qs;
|
||||||
|
ngx_resolver_hdr_t *query;
|
||||||
|
|
||||||
|
- nlen = ctx->name.len ? (1 + ctx->name.len + 1) : 1;
|
||||||
|
+ nlen = name->len ? (1 + name->len + 1) : 1;
|
||||||
|
|
||||||
|
len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
|
||||||
|
|
||||||
|
#if (NGX_HAVE_INET6)
|
||||||
|
- r = ctx->resolver;
|
||||||
|
-
|
||||||
|
- p = ngx_resolver_alloc(ctx->resolver, r->ipv6 ? len * 2 : len);
|
||||||
|
+ p = ngx_resolver_alloc(r, r->ipv6 ? len * 2 : len);
|
||||||
|
#else
|
||||||
|
- p = ngx_resolver_alloc(ctx->resolver, len);
|
||||||
|
+ p = ngx_resolver_alloc(r, len);
|
||||||
|
#endif
|
||||||
|
if (p == NULL) {
|
||||||
|
return NGX_ERROR;
|
||||||
|
@@ -2535,8 +2576,8 @@ ngx_resolver_create_name_query(ngx_resol
|
||||||
|
|
||||||
|
ident = ngx_random();
|
||||||
|
|
||||||
|
- ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->resolver->log, 0,
|
||||||
|
- "resolve: \"%V\" A %i", &ctx->name, ident & 0xffff);
|
||||||
|
+ ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
|
||||||
|
+ "resolve: \"%V\" A %i", name, ident & 0xffff);
|
||||||
|
|
||||||
|
query->ident_hi = (u_char) ((ident >> 8) & 0xff);
|
||||||
|
query->ident_lo = (u_char) (ident & 0xff);
|
||||||
|
@@ -2566,11 +2607,11 @@ ngx_resolver_create_name_query(ngx_resol
|
||||||
|
p--;
|
||||||
|
*p-- = '\0';
|
||||||
|
|
||||||
|
- if (ctx->name.len == 0) {
|
||||||
|
+ if (name->len == 0) {
|
||||||
|
return NGX_DECLINED;
|
||||||
|
}
|
||||||
|
|
||||||
|
- for (s = ctx->name.data + ctx->name.len - 1; s >= ctx->name.data; s--) {
|
||||||
|
+ for (s = name->data + name->len - 1; s >= name->data; s--) {
|
||||||
|
if (*s != '.') {
|
||||||
|
*p = *s;
|
||||||
|
len++;
|
||||||
|
@@ -2606,8 +2647,8 @@ ngx_resolver_create_name_query(ngx_resol
|
||||||
|
|
||||||
|
ident = ngx_random();
|
||||||
|
|
||||||
|
- ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->resolver->log, 0,
|
||||||
|
- "resolve: \"%V\" AAAA %i", &ctx->name, ident & 0xffff);
|
||||||
|
+ ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
|
||||||
|
+ "resolve: \"%V\" AAAA %i", name, ident & 0xffff);
|
||||||
|
|
||||||
|
query->ident_hi = (u_char) ((ident >> 8) & 0xff);
|
||||||
|
query->ident_lo = (u_char) (ident & 0xff);
|
||||||
|
@@ -2624,11 +2665,12 @@ ngx_resolver_create_name_query(ngx_resol
|
||||||
|
|
||||||
|
|
||||||
|
static ngx_int_t
|
||||||
|
-ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
|
||||||
|
+ngx_resolver_create_addr_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
|
||||||
|
+ ngx_addr_t *addr)
|
||||||
|
{
|
||||||
|
u_char *p, *d;
|
||||||
|
size_t len;
|
||||||
|
- in_addr_t addr;
|
||||||
|
+ in_addr_t inaddr;
|
||||||
|
ngx_int_t n;
|
||||||
|
ngx_uint_t ident;
|
||||||
|
ngx_resolver_hdr_t *query;
|
||||||
|
@@ -2637,7 +2679,7 @@ ngx_resolver_create_addr_query(ngx_resol
|
||||||
|
struct sockaddr_in6 *sin6;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- switch (ctx->addr.sockaddr->sa_family) {
|
||||||
|
+ switch (addr->sockaddr->sa_family) {
|
||||||
|
|
||||||
|
#if (NGX_HAVE_INET6)
|
||||||
|
case AF_INET6:
|
||||||
|
@@ -2654,7 +2696,7 @@ ngx_resolver_create_addr_query(ngx_resol
|
||||||
|
+ sizeof(ngx_resolver_qs_t);
|
||||||
|
}
|
||||||
|
|
||||||
|
- p = ngx_resolver_alloc(ctx->resolver, len);
|
||||||
|
+ p = ngx_resolver_alloc(r, len);
|
||||||
|
if (p == NULL) {
|
||||||
|
return NGX_ERROR;
|
||||||
|
}
|
||||||
|
@@ -2678,11 +2720,11 @@ ngx_resolver_create_addr_query(ngx_resol
|
||||||
|
|
||||||
|
p += sizeof(ngx_resolver_hdr_t);
|
||||||
|
|
||||||
|
- switch (ctx->addr.sockaddr->sa_family) {
|
||||||
|
+ switch (addr->sockaddr->sa_family) {
|
||||||
|
|
||||||
|
#if (NGX_HAVE_INET6)
|
||||||
|
case AF_INET6:
|
||||||
|
- sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr;
|
||||||
|
+ sin6 = (struct sockaddr_in6 *) addr->sockaddr;
|
||||||
|
|
||||||
|
for (n = 15; n >= 0; n--) {
|
||||||
|
p = ngx_sprintf(p, "\1%xd\1%xd",
|
||||||
|
@@ -2697,11 +2739,11 @@ ngx_resolver_create_addr_query(ngx_resol
|
||||||
|
|
||||||
|
default: /* AF_INET */
|
||||||
|
|
||||||
|
- sin = (struct sockaddr_in *) ctx->addr.sockaddr;
|
||||||
|
- addr = ntohl(sin->sin_addr.s_addr);
|
||||||
|
+ sin = (struct sockaddr_in *) addr->sockaddr;
|
||||||
|
+ inaddr = ntohl(sin->sin_addr.s_addr);
|
||||||
|
|
||||||
|
for (n = 0; n < 32; n += 8) {
|
||||||
|
- d = ngx_sprintf(&p[1], "%ud", (addr >> n) & 0xff);
|
||||||
|
+ d = ngx_sprintf(&p[1], "%ud", (inaddr >> n) & 0xff);
|
||||||
|
*p = (u_char) (d - &p[1]);
|
||||||
|
p = d;
|
||||||
|
}
|
||||||
|
@@ -2815,21 +2857,13 @@ done:
|
||||||
|
static void
|
||||||
|
ngx_resolver_timeout_handler(ngx_event_t *ev)
|
||||||
|
{
|
||||||
|
- ngx_resolver_ctx_t *ctx, *next;
|
||||||
|
- ngx_resolver_node_t *rn;
|
||||||
|
+ ngx_resolver_ctx_t *ctx;
|
||||||
|
|
||||||
|
- rn = ev->data;
|
||||||
|
- ctx = rn->waiting;
|
||||||
|
- rn->waiting = NULL;
|
||||||
|
+ ctx = ev->data;
|
||||||
|
|
||||||
|
- do {
|
||||||
|
- ctx->state = NGX_RESOLVE_TIMEDOUT;
|
||||||
|
- next = ctx->next;
|
||||||
|
-
|
||||||
|
- ctx->handler(ctx);
|
||||||
|
+ ctx->state = NGX_RESOLVE_TIMEDOUT;
|
||||||
|
|
||||||
|
- ctx = next;
|
||||||
|
- } while (ctx);
|
||||||
|
+ ctx->handler(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
diff -upr nginx-1.9.7-old/src/core/ngx_resolver.h nginx-1.9.7/src/core/ngx_resolver.h
|
||||||
|
--- nginx-1.9.7-old/src/core/ngx_resolver.h 2016-01-26 11:54:55.914404751 -0800
|
||||||
|
+++ nginx-1.9.7/src/core/ngx_resolver.h 2016-01-26 11:55:27.068784001 -0800
|
||||||
|
@@ -51,15 +51,11 @@ typedef void (*ngx_resolver_handler_pt)(
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
- /* PTR: resolved name, A: name to resolve */
|
||||||
|
- u_char *name;
|
||||||
|
-
|
||||||
|
+ ngx_rbtree_node_t node;
|
||||||
|
ngx_queue_t queue;
|
||||||
|
|
||||||
|
- /* event ident must be after 3 pointers as in ngx_connection_t */
|
||||||
|
- ngx_int_t ident;
|
||||||
|
-
|
||||||
|
- ngx_rbtree_node_t node;
|
||||||
|
+ /* PTR: resolved name, A: name to resolve */
|
||||||
|
+ u_char *name;
|
||||||
|
|
||||||
|
#if (NGX_HAVE_INET6)
|
||||||
|
/* PTR: IPv6 address to resolve (IPv4 address is in rbtree node key) */
|
||||||
|
@@ -147,6 +143,9 @@ struct ngx_resolver_ctx_s {
|
||||||
|
ngx_resolver_t *resolver;
|
||||||
|
ngx_udp_connection_t *udp_connection;
|
||||||
|
|
||||||
|
+ /* event ident must be after 3 pointers as in ngx_connection_t */
|
||||||
|
+ ngx_int_t ident;
|
||||||
|
+
|
||||||
|
ngx_int_t state;
|
||||||
|
ngx_str_t name;
|
||||||
|
|
||||||
|
@@ -162,6 +161,8 @@ struct ngx_resolver_ctx_s {
|
||||||
|
ngx_uint_t quick; /* unsigned quick:1; */
|
||||||
|
ngx_uint_t recursion;
|
||||||
|
ngx_event_t *event;
|
||||||
|
+
|
||||||
|
+ ngx_resolver_node_t *node;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
42
patches/nginx-1.9.7-ssl_cert_cb_yield.patch
Normal file
42
patches/nginx-1.9.7-ssl_cert_cb_yield.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Yichun Zhang <agentzh@openresty.org>
|
||||||
|
# Date 1451762084 28800
|
||||||
|
# Sat Jan 02 11:14:44 2016 -0800
|
||||||
|
# Node ID 449f0461859c16e95bdb18e8be6b94401545d3dd
|
||||||
|
# Parent 78b4e10b4367b31367aad3c83c9c3acdd42397c4
|
||||||
|
SSL: handled SSL_CTX_set_cert_cb() callback yielding.
|
||||||
|
|
||||||
|
OpenSSL 1.0.2+ introduces SSL_CTX_set_cert_cb() to allow custom
|
||||||
|
callbacks to serve the SSL certificiates and private keys dynamically
|
||||||
|
and lazily. The callbacks may yield for nonblocking I/O or sleeping.
|
||||||
|
Here we added support for such usage in NGINX 3rd-party modules
|
||||||
|
(like ngx_lua) in NGINX's event handlers for downstream SSL
|
||||||
|
connections.
|
||||||
|
|
||||||
|
diff -r 78b4e10b4367 -r 449f0461859c src/event/ngx_event_openssl.c
|
||||||
|
--- a/src/event/ngx_event_openssl.c Thu Dec 17 16:39:15 2015 +0300
|
||||||
|
+++ b/src/event/ngx_event_openssl.c Sat Jan 02 11:14:44 2016 -0800
|
||||||
|
@@ -1210,6 +1210,23 @@
|
||||||
|
return NGX_AGAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
|
||||||
|
+ if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
|
||||||
|
+ c->read->handler = ngx_ssl_handshake_handler;
|
||||||
|
+ c->write->handler = ngx_ssl_handshake_handler;
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NGX_AGAIN;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
|
||||||
|
|
||||||
|
c->ssl->no_wait_shutdown = 1;
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
%define dir_name openresty
|
%define dir_name openresty
|
||||||
|
|
||||||
Name: ngx_openresty
|
Name: openresty
|
||||||
|
|
||||||
Version: 1.0.5.1
|
Version: 1.0.5.1
|
||||||
Release: 5
|
Release: 5
|
||||||
@ -14,7 +14,7 @@ Group: Productivity/Networking/Web/Servers
|
|||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.openresty.org/
|
URL: http://www.openresty.org/
|
||||||
|
|
||||||
Source0: ngx_openresty-%{version}rc%{release}.tar.gz
|
Source0: openresty-%{version}rc%{release}.tar.gz
|
||||||
|
|
||||||
BuildRoot: %{build_root}
|
BuildRoot: %{build_root}
|
||||||
|
|
||||||
@ -23,11 +23,11 @@ BuildRequires: gcc >= 3.0, openssl-devel, pcre-devel, readline-devel
|
|||||||
Requires: openssl, pcre, readline
|
Requires: openssl, pcre, readline
|
||||||
|
|
||||||
%description
|
%description
|
||||||
OpenResty (aka. ngx_openresty) is a full-fledged web application server by bundling the standard Nginx core, lots of 3rd-party Nginx modules, as well as most of their external dependencie
|
OpenResty is a full-fledged web application server by bundling the standard Nginx core, lots of 3rd-party Nginx modules, as well as most of their external dependencie
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
#%setup -q -n ngx_openresty-%{version}
|
#%setup -q -n openresty-%{version}
|
||||||
%setup -q -n ngx_openresty-%{version}rc%{release}
|
%setup -q -n openresty-%{version}rc%{release}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#--with-pg_config=opt/pg90/bin/pg_config \
|
#--with-pg_config=opt/pg90/bin/pg_config \
|
@ -23,7 +23,7 @@ sub run_tests {
|
|||||||
my $ver = `bash util/ver`;
|
my $ver = `bash util/ver`;
|
||||||
chomp $ver;
|
chomp $ver;
|
||||||
|
|
||||||
cd "ngx_openresty-$ver";
|
cd "openresty-$ver";
|
||||||
|
|
||||||
$DistRoot = cwd();
|
$DistRoot = cwd();
|
||||||
$BuildRoot = File::Spec->rel2abs("./build");
|
$BuildRoot = File::Spec->rel2abs("./build");
|
||||||
|
312
t/sanity.t
312
t/sanity.t
File diff suppressed because it is too large
Load Diff
@ -15,7 +15,7 @@ getopts("lf:", \%opts) or die "Usage: $0 [-f] [-l] <cores>\n";
|
|||||||
my $jobs = shift || 4;
|
my $jobs = shift || 4;
|
||||||
|
|
||||||
my $cwd = cwd();
|
my $cwd = cwd();
|
||||||
if ($cwd !~ /ngx_openresty-(\d+(?:\.\d+)+(?:rc\d+(?:\.\d+)?)?)$/) {
|
if ($cwd !~ /openresty-(\d+(?:\.\d+)+(?:rc\d+(?:\.\d+)?)?)$/) {
|
||||||
die "Bad current working directory: $cwd\n";
|
die "Bad current working directory: $cwd\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,8 +46,10 @@ if ($^O eq 'solaris') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($^O eq 'darwin') {
|
if ($^O eq 'darwin') {
|
||||||
$cfg_opts .= " --with-cc-opt='-I/usr/local/include'"
|
$cfg_opts .= " --with-cc-opt='-I/usr/local/opt/openssl/include/ "
|
||||||
. " --with-ld-opt='-L/usr/local/lib'";
|
. "-I/usr/local/opt/pcre/include/'"
|
||||||
|
. " --with-ld-opt='-L/usr/local/opt/openssl/lib/ "
|
||||||
|
. "-L/usr/local/opt/pcre/lib/'";
|
||||||
}
|
}
|
||||||
|
|
||||||
my $prefix;
|
my $prefix;
|
||||||
@ -65,6 +67,45 @@ sub write_config_file ($) {
|
|||||||
|
|
||||||
write_config_file "/tmp/nginx.conf";
|
write_config_file "/tmp/nginx.conf";
|
||||||
|
|
||||||
|
warn "=== --with-stream ===\n";
|
||||||
|
$prefix = "/usr/local/openresty-nogzip";
|
||||||
|
sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
|
||||||
|
unless ($opts{f}) {
|
||||||
|
sh "./configure $cfg_opts --with-stream --prefix=$prefix -j$jobs > /dev/null";
|
||||||
|
}
|
||||||
|
sh "$make -j$jobs > /dev/null";
|
||||||
|
sh "sudo $make install > /dev/null";
|
||||||
|
sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
|
||||||
|
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
|
||||||
|
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-stream'";
|
||||||
|
system "sudo killall nginx > /dev/null 2>&1";
|
||||||
|
sh "sudo $prefix/nginx/sbin/nginx";
|
||||||
|
sh "curl -si localhost/lua|grep $lua";
|
||||||
|
sh "curl -si localhost/lua|grep $ver";
|
||||||
|
sh "curl -si localhost/cjson|grep 'json.safe: '";
|
||||||
|
sh qq{$prefix/bin/resty -e 'ngx.say("Hello World!")'|grep 'Hello World'};
|
||||||
|
sh "sudo $prefix/nginx/sbin/nginx -sstop";
|
||||||
|
|
||||||
|
warn "=== --with-stream + dtrace static probes ===\n";
|
||||||
|
$prefix = "/usr/local/openresty-nogzip";
|
||||||
|
sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
|
||||||
|
unless ($opts{f}) {
|
||||||
|
sh "./configure $cfg_opts --with-dtrace-probes --with-stream --prefix=$prefix -j$jobs > /dev/null";
|
||||||
|
}
|
||||||
|
sh "$make -j$jobs > /dev/null";
|
||||||
|
sh "sudo $make install > /dev/null";
|
||||||
|
sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
|
||||||
|
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
|
||||||
|
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-stream'";
|
||||||
|
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-dtrace-probes'";
|
||||||
|
system "sudo killall nginx > /dev/null 2>&1";
|
||||||
|
sh "sudo $prefix/nginx/sbin/nginx";
|
||||||
|
sh "curl -si localhost/lua|grep $lua";
|
||||||
|
sh "curl -si localhost/lua|grep $ver";
|
||||||
|
sh "curl -si localhost/cjson|grep 'json.safe: '";
|
||||||
|
sh qq{$prefix/bin/resty -e 'ngx.say("Hello World!")'|grep 'Hello World'};
|
||||||
|
sh "sudo $prefix/nginx/sbin/nginx -sstop";
|
||||||
|
|
||||||
warn "=== Without Gzip/SSL/PCRE ===\n";
|
warn "=== Without Gzip/SSL/PCRE ===\n";
|
||||||
$prefix = "/usr/local/openresty-nogzip";
|
$prefix = "/usr/local/openresty-nogzip";
|
||||||
sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
|
sh "sudo rm -rf $prefix/lualib $prefix/luajit $prefix/bin $prefix/lua $prefix/nginx/sbin $prefix/nginx/html";
|
||||||
@ -221,6 +262,13 @@ http {
|
|||||||
end
|
end
|
||||||
';
|
';
|
||||||
|
|
||||||
|
upstream backend {
|
||||||
|
server 0.0.0.1;
|
||||||
|
balancer_by_lua_block {
|
||||||
|
print("balancer!")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen *:80;
|
listen *:80;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
|
@ -8,7 +8,7 @@ sub cd ($);
|
|||||||
my $ver = `bash util/ver`;
|
my $ver = `bash util/ver`;
|
||||||
chomp $ver;
|
chomp $ver;
|
||||||
|
|
||||||
cd "ngx_openresty-$ver/bundle";
|
cd "openresty-$ver/bundle";
|
||||||
|
|
||||||
opendir(my $dh, '.') or
|
opendir(my $dh, '.') or
|
||||||
die "cannot opendir .: $!";
|
die "cannot opendir .: $!";
|
||||||
@ -45,7 +45,7 @@ for my $t_file (@t_files) {
|
|||||||
warn "\n- $orig";
|
warn "\n- $orig";
|
||||||
warn "+ $_";
|
warn "+ $_";
|
||||||
|
|
||||||
} elsif (s{ngx_openresty-\d+\.\d+\.\d+\.\d+(?:rc\d+)?}{ngx_openresty-$ver} && $orig ne $_) {
|
} elsif (s{openresty-\d+\.\d+\.\d+\.\d+(?:rc\d+)?}{openresty-$ver} && $orig ne $_) {
|
||||||
$changed++;
|
$changed++;
|
||||||
|
|
||||||
warn "\n- $orig";
|
warn "\n- $orig";
|
||||||
|
@ -14,7 +14,7 @@ cachefile=$work/$outfile
|
|||||||
if [ -s $cachefile ]; then
|
if [ -s $cachefile ]; then
|
||||||
cp $work/$outfile $outfile || exit 1
|
cp $work/$outfile $outfile || exit 1
|
||||||
else
|
else
|
||||||
wget --no-check-certificate $1 -O $3 || exit 1
|
wget $1 -O $3 || exit 1
|
||||||
if [ $? == 0 ]; then
|
if [ $? == 0 ]; then
|
||||||
cp $3 $work/ || exit 1
|
cp $3 $work/ || exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -5,11 +5,11 @@ root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`
|
|||||||
|
|
||||||
info_txt=`perl -e 'print "\033[33m[INFO]\033[0m"'`
|
info_txt=`perl -e 'print "\033[33m[INFO]\033[0m"'`
|
||||||
|
|
||||||
echo -n "ngx_openresty "
|
echo -n "openresty "
|
||||||
. ./util/ver
|
. ./util/ver
|
||||||
echo
|
echo
|
||||||
|
|
||||||
name=ngx_openresty-$version
|
name=openresty-$version
|
||||||
work=$root/work
|
work=$root/work
|
||||||
|
|
||||||
if [ -z $debug ]; then
|
if [ -z $debug ]; then
|
||||||
@ -26,7 +26,7 @@ fi
|
|||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver="$main_ver"
|
ver="$main_ver"
|
||||||
$root/util/get-tarball "http://openresty.org/download/nginx-$ver.tar.gz" -O nginx-$ver.tar.gz || exit 1
|
$root/util/get-tarball "https://openresty.org/download/nginx-$ver.tar.gz" -O nginx-$ver.tar.gz || exit 1
|
||||||
tar -xzf nginx-$ver.tar.gz || exit 1
|
tar -xzf nginx-$ver.tar.gz || exit 1
|
||||||
cd nginx-$ver || exit 1
|
cd nginx-$ver || exit 1
|
||||||
|
|
||||||
@ -293,12 +293,22 @@ if [ "$answer" = "N" ]; then
|
|||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$main_ver" = "1.9.7" ]; then
|
||||||
|
echo "$info_txt applying the resolver_security_fixes patch for nginx"
|
||||||
|
patch -p1 < $root/patches/nginx-$main_ver-resolver_security_fixes.patch || exit 1
|
||||||
|
echo
|
||||||
|
fi
|
||||||
|
|
||||||
rm -f *.patch || exit 1
|
rm -f *.patch || exit 1
|
||||||
|
|
||||||
echo "$info_txt applying the always_enable_cc_feature_tests patch to nginx"
|
echo "$info_txt applying the always_enable_cc_feature_tests patch to nginx"
|
||||||
patch -p1 < $root/patches/nginx-$main_ver-always_enable_cc_feature_tests.patch
|
patch -p1 < $root/patches/nginx-$main_ver-always_enable_cc_feature_tests.patch
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
echo "$info_txt applying the ssl_cert_cb_yield.patch patch to nginx"
|
||||||
|
patch -p1 < $root/patches/nginx-$main_ver-ssl_cert_cb_yield.patch
|
||||||
|
echo
|
||||||
|
|
||||||
cd .. || exit 1
|
cd .. || exit 1
|
||||||
|
|
||||||
cp $root/patches/nginx-$main_ver-no_pool.patch ./nginx-no_pool.patch || exit 1
|
cp $root/patches/nginx-$main_ver-no_pool.patch ./nginx-no_pool.patch || exit 1
|
||||||
@ -366,7 +376,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.9.20
|
ver=0.10.0
|
||||||
$root/util/get-tarball "https://github.com/openresty/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "https://github.com/openresty/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 openresty-lua-nginx-module-* ngx_lua-$ver || exit 1
|
mv openresty-lua-nginx-module-* ngx_lua-$ver || exit 1
|
||||||
@ -431,7 +441,7 @@ mv openresty-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ve
|
|||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.3.7
|
ver=0.3.7
|
||||||
$root/util/get-tarball "http://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "https://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
|
mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
|
||||||
|
|
||||||
@ -501,7 +511,7 @@ echo
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=2.1-20151219
|
ver=2.1-20160108
|
||||||
$root/util/get-tarball "https://github.com/openresty/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
|
$root/util/get-tarball "https://github.com/openresty/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
|
||||||
tar -xzf LuaJIT-$ver.tar.gz || exit 1
|
tar -xzf LuaJIT-$ver.tar.gz || exit 1
|
||||||
mv luajit2-* LuaJIT-$ver || exit 1
|
mv luajit2-* LuaJIT-$ver || exit 1
|
||||||
@ -665,7 +675,7 @@ cd ..
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.1.3
|
ver=0.1.4
|
||||||
$root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
|
$root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
|
||||||
tar -xzf lua-resty-core-$ver.tar.gz || exit 1
|
tar -xzf lua-resty-core-$ver.tar.gz || exit 1
|
||||||
mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1
|
mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1
|
||||||
|
Reference in New Issue
Block a user