Skip to content

Generate ngx_http_lua v0.10.15 and added ports to ngx_stream_lua #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 40 commits into from
Aug 27, 2019
Merged

Generate ngx_http_lua v0.10.15 and added ports to ngx_stream_lua #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
084a599
bugfix: ensured the 'ngx.req.socket()' API is injected in the ngx_htt…
thibaultcha Jul 31, 2019
3a6f633
bugfix: avoided generating the 'tcpsock:shutdown()' API in the ngx_ht…
thibaultcha Jul 29, 2019
1ac5dc5
bugfix: avoided generating raw_downstream UDP sockets in the ngx_http…
thibaultcha Jul 29, 2019
e8ad29a
bugfix: replaced 'ngx_udp_send()' with 'ngx_send()' in 'ngx_http_lua_…
thibaultcha Jul 29, 2019
a4b8784
bugfix: used 'log_prefix' template variable in ngx_subsys_lua_ssl_cer…
thibaultcha Jul 28, 2019
823c3e2
bugfix: fixed a compilation warning due to unused variables when comp…
thibaultcha Jul 29, 2019
e865fc1
bugfix: ensured we align with ngx_http_lua module in 'ngx_http_lua_ng…
thibaultcha Jul 31, 2019
d1268f5
chore: makefile: allowed .tt2 templates to be compiled from a subsyst…
thibaultcha Jul 31, 2019
603ef77
synchronized with lua-nginx-module #b5ffb11.
thibaultcha Jan 17, 2019
14ddd35
synchronized with lua-nginx-module #52af63a.
thibaultcha Jan 16, 2019
7791507
synchronized with lua-nginx-module #fbb8919.
thibaultcha Jan 16, 2019
f2b048f
synchronized with lua-nginx-module #84338ab.
thibaultcha Jul 27, 2019
0ea20aa
synchronized with lua-nginx-module #55743ae.
thibaultcha Jul 27, 2019
11b53e5
synchronized with lua-nginx-module #809192c.
thibaultcha Jul 27, 2019
933d8d6
synchronized with lua-nginx-module #e94f2e5.
thibaultcha Jul 27, 2019
8feb993
synchronized with lua-nginx-module #2fb8f12.
thibaultcha Jul 27, 2019
9bbaeea
synchronized with lua-nginx-module #23e69fb.
thibaultcha Jul 27, 2019
9a33f1d
synchronized with lua-nginx-module #b2af4d3.
thibaultcha Jul 27, 2019
76bf83a
synchronized with lua-nginx-module #53519cd.
thibaultcha Jul 28, 2019
6a321b1
synchronized with lua-nginx-module #08a9baa.
thibaultcha Jul 28, 2019
8f72d44
synchronized with lua-nginx-module #f64ec8c.
thibaultcha Jul 28, 2019
6705066
synchronized with lua-nginx-module #248060b.
thibaultcha Jul 28, 2019
3172dd0
synchronized with lua-nginx-module #c2940c1, #8edb21a, and #761ddca.
thibaultcha Jul 30, 2019
df3feb9
synchronized with lua-nginx-module #aef03eb, #ee47e55, #afeeb84, and …
thibaultcha Jul 30, 2019
7387ba2
synchronized with lua-nginx-module #28cf5ce.
thibaultcha Jul 30, 2019
f0481cc
optimize: fixed the pre-allocated number of keys in the 'ngx.req' and…
thibaultcha Jul 29, 2019
d1d91ff
style: minor fixes to align with ngx_http_lua.
thibaultcha Jul 28, 2019
3018ec8
feature: enabled 'tcpsock:receiveany()' support in ngx_stream_lua.
thibaultcha Aug 26, 2019
d05808d
synchronized with lua-nginx-module #33a5517 (fixed clang warnings).
thibaultcha Aug 15, 2019
b07b909
synchronized with lua-nginx-module #59b6430 (fix LuaJIT current line …
thibaultcha Aug 15, 2019
c632dae
synchronized with lua-nginx-module #09484e8 (do not mutate another mo…
thibaultcha Aug 15, 2019
9a9fd01
synchronized with lua-nginx-module #a96e99a (only compile with LuaJIT…
thibaultcha Aug 15, 2019
8cad50e
synchronized with lua-nginx-module #60736e6 (deprecate 'lua_load_rest…
thibaultcha Aug 15, 2019
65fad06
synchronized with lua-nginx-module #947fa00 (retired the old CFunctio…
thibaultcha Aug 27, 2019
1bd5f8f
synchronized with lua-nginx-module #c5135a0 (removed compatibility co…
thibaultcha Aug 27, 2019
52984a0
synchronized with lua-nginx-module #189ba24 (log function location on…
thibaultcha Aug 27, 2019
61364cd
synchronized with lua-nginx-module #97f0101 (enable ngx.thread and ng…
thibaultcha Aug 27, 2019
8124b6d
synchronized with lua-nginx-module #9a892b8 (coroutine.wrap propagate…
thibaultcha Aug 27, 2019
32813bd
synchronized with lua-nginx-module #2a19073 (remove error logging on …
thibaultcha Aug 27, 2019
dcedde8
feature: enabled FFI-based 'ngx.status' getter in ngx_stream_lua.
thibaultcha Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ API_TEMPLATE_TARGETS=$(subst _subsys_,_$(SUBSYS)_, $(patsubst src/subsys/%.tt2,
MINI_TT2=util/mini-tt2.pl

.PHONY: all
all: $(DESTDIR)/api $(TEMPLATE_TARGETS) $(API_TEMPLATE_TARGETS) $(SUBSYS_TARGETS)
cp src/$(SUBSYS)/* $(DESTDIR)
all: $(DESTDIR)/api $(TEMPLATE_TARGETS) $(API_TEMPLATE_TARGETS)
find src/$(SUBSYS) -type f -name '*.tt2' -exec $(MINI_TT2) -d $(DESTDIR) -s $(SUBSYS) '{}' ';'
$(shell cp src/$(SUBSYS)/*.{h,c} $(DESTDIR))

$(DESTDIR)/api/ngx_http_%: src/subsys/api/ngx_subsys_%.tt2
$(MINI_TT2) -d $(DESTDIR)/api -s http $<
Expand Down
7 changes: 1 addition & 6 deletions src/http/ngx_http_lua_accessby.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ngx_http_lua_access_handler(ngx_http_request_t *r)
#endif

if (cur_ph < last_ph) {
dd("swaping the contents of cur_ph and last_ph...");
dd("swapping the contents of cur_ph and last_ph...");

tmp = *cur_ph;

Expand Down Expand Up @@ -145,11 +145,6 @@ ngx_http_lua_access_handler(ngx_http_request_t *r)
ngx_http_lua_generic_phase_post_read);

if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
#if (nginx_version < 1002006) || \
(nginx_version >= 1003000 && nginx_version < 1003009)
r->main->count--;
#endif

return rc;
}

Expand Down
7 changes: 0 additions & 7 deletions src/http/ngx_http_lua_bodyfilterby.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@
#include "ngx_http_lua_exception.h"
#include "ngx_http_lua_util.h"
#include "ngx_http_lua_pcrefix.h"
#include "ngx_http_lua_time.h"
#include "ngx_http_lua_log.h"
#include "ngx_http_lua_regex.h"
#include "ngx_http_lua_cache.h"
#include "ngx_http_lua_headers.h"
#include "ngx_http_lua_variable.h"
#include "ngx_http_lua_string.h"
#include "ngx_http_lua_misc.h"
#include "ngx_http_lua_consts.h"
Expand Down Expand Up @@ -317,11 +314,7 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
return NGX_ERROR;
}

#if nginx_version >= 1001004
ngx_chain_update_chains(r->pool,
#else
ngx_chain_update_chains(
#endif
&ctx->free_bufs, &ctx->busy_bufs, &out,
(ngx_buf_tag_t) &ngx_http_lua_module);

Expand Down
3 changes: 0 additions & 3 deletions src/http/ngx_http_lua_headerfilterby.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@
#include "ngx_http_lua_exception.h"
#include "ngx_http_lua_util.h"
#include "ngx_http_lua_pcrefix.h"
#include "ngx_http_lua_time.h"
#include "ngx_http_lua_log.h"
#include "ngx_http_lua_regex.h"
#include "ngx_http_lua_cache.h"
#include "ngx_http_lua_headers.h"
#include "ngx_http_lua_variable.h"
#include "ngx_http_lua_string.h"
#include "ngx_http_lua_misc.h"
#include "ngx_http_lua_consts.h"
Expand Down
Loading