Commit Graph

262 Commits (53dde2ec7b1f157bf3b17460a56638c4eaed7c69)

Author SHA1 Message Date
Thibault Charbonnier f77c3f84ac refactor: util/*: improved mirror-tarballs script and removed obsolete patches and files.
Fixes
-----

* Apply the init_cycle_pool_release patches to NGINX cores >= 1.13.6
  instead of == 1.13.6

Improvements to util/mirror-tarballs
------------------------------------

* Grouped all bundled components versions in `util/ver`
* Sped up with parallel downloads (45s vs 75s)
* Produced smaller tarballs (4.4Mb vs 4.7Mb)
* Reduced Perl usage to stay in Bash as much as possible
* Greatly reduced code duplication
* Ensured we include all OpenSSL patches automatically
* We now check for missing commands before running

Diff of openresty-tarball-master (prior) and openresty-tarball-refactor
(after this patch):

    $ diff -qr openresty-tarball-master openresty-tarball-refactor
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/cc: clang.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/cc: conf.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/cc: gcc.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/cc: icc.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto: options.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/os: linux.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto: sources.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto: unix.orig
    diff -yr --suppress-common-lines ./openresty-tarball-master/bundle/nginx-1.17.1/src/core/nginx.c ./openresty-tarball-refactor/bundle/nginx-1.17.1/src/core/nginx.c
                 > ngx_pool_t         *saved_init_cycle_pool = NULL;
                 >
                 >     saved_init_cycle_pool = init_cycle.pool;
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: nginx.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: ngx_connection.c.orig
    diff -yr --suppress-common-lines ./openresty-tarball-master/bundle/nginx-1.17.1/src/core/ngx_core.h ./openresty-tarball-refactor/bundle/nginx-1.17.1/src/core/ngx_core.h
                 > extern ngx_pool_t        *saved_init_cycle_pool;
                 >
    diff -yr --suppress-common-lines ./openresty-tarball-master/bundle/nginx-1.17.1/src/core/ngx_cycle.c ./openresty-tarball-refactor/bundle/nginx-1.17.1/src/core/ngx_cycle.c
                 >         if (ngx_is_init_cycle(old_cycle)) {
                 >             saved_init_cycle_pool = NULL;
                 >         }
                 >
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: ngx_cycle.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: ngx_log.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: ngx_resolver.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/event: ngx_event_accept.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/event: ngx_event_connect.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/event: ngx_event.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/event: ngx_event_openssl.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http/modules: ngx_http_log_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http/modules: ngx_http_proxy_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_core_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_request.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_special_response.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_upstream.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_upstream.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http/v2: ngx_http_v2_filter_module.c.orig
    diff -yr --suppress-common-lines ./openresty-tarball-master/bundle/nginx-1.17.1/src/os/unix/ngx_process_cycle.c ./openresty-tarball-refactor/bundle/nginx-1.17.1/src/os/unix/ngx_process_cycle.c
                 >     if (saved_init_cycle_pool != NULL && saved_init_cycle_poo
                 >         ngx_destroy_pool(saved_init_cycle_pool);
                 >         saved_init_cycle_pool = NULL;
                 >     }
                 >
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/os/unix: ngx_process_cycle.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream_proxy_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream_ssl_preread_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream_upstream.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream_upstream_round_robin.c.orig
    Only in ./openresty-tarball-master/bundle: nginx-no_pool.patch
    Only in ./openresty-tarball-master/bundle/redis-nginx-module-0.3.7: ngx_http_redis_module.c.orig
    diff -yr --suppress-common-lines ./openresty-tarball-master/configure ./openresty-tarball-refactor/configure
            shell "patch -p0 < nginx-no_pool.patch";       |         shell "patch -p0 < ../patches/nginx-no_pool.patch";
    Only in ./openresty-tarball-master: Makefile
    Only in ./openresty-tarball-refactor/patches: nginx-no_pool.patch
    Only in ./openresty-tarball-refactor/patches: openssl-1.1.1c-sess_set_get_cb_yield.patch

Other notes
-----------

* Removed all patches for NGINX cores 1.5.x and below (we only support 1.6.0+)
* Removed all patches for NGINX cores that were never part of an official OpenResty release
* Removed obsolete lua-cjson patch
* Removed all PUC-Rio Lua 5.1 patches
* Removed all unused patches
* Removed LuaJIT 2.0 patch
6 years ago
Thibault Charbonnier 4995101388 tests: sanity.t: fixed (again) test cases failing due to the last few commits.
This failure was first fixed in
1f3cf84a8a, but mistakenly reverted in
395bed2b14, causing Travis-CI to fail on
this test again.
6 years ago
Yichun Zhang (agentzh) 3fd0e186bf tests: fixed tests for updated components. 6 years ago
Yichun Zhang (agentzh) 395bed2b14 bugfix: windows: make clean: we did not clear many windows-specific files. 6 years ago
Thibault Charbonnier cef09e553f
upgraded the nginx core to 1.17.1. 6 years ago
Thibault Charbonnier 836c8792d2 tests: sanity.t: fixed test cases failing due to the last few commits. 6 years ago
Thibault Charbonnier 1f3cf84a8a tests: sanity.t: fixed test cases failing due to the last few commits and renamed another test case. 6 years ago
Yichun Zhang (agentzh) cc9787a290 feature: ./configure: added new option --with-luajit-ldflags=OPTS for specifying custom luajit linker flags. 6 years ago
Thibault Charbonnier a32ca0dbbe upgraded LuaJIT to 2.1-20190507. 6 years ago
Thibault Charbonnier 62d31e53de bumped ngx_http_lua to 0.10.15, ngx_stream_lua to 0.0.7, and lua-resty-core to 0.1.17. 6 years ago
Thibault Charbonnier 023b9d4f88 tests: updated sanity test suite to reflect recent changes in bumped components. 6 years ago
Thibault Charbonnier 88e214aad2 bumped LuaJIT to 2.1-20190228. 6 years ago
Thibault Charbonnier ec8f1b0753 bumped lua-resty-upstream-healthcheck to 0.06. 6 years ago
Thibault Charbonnier 191ca1fdec bumped resty-cli to 0.23. 6 years ago
Yichun Zhang (agentzh) e2ca65128f tests: updated tests to reflect recent changes. 6 years ago
Thibault Charbonnier f238a7542a bumped ngx_lua, ngx_stream_lua, and lua-resty-core to formal releases. 6 years ago
Thibault Charbonnier 95cfc25189 bumped resty-cli, lua-cjson, lua-resty-redis, lua-resty-limit-traffic, lua-resty-websocket, lua-resty-lock, and lua-resty-lrucache to formal release tags. 6 years ago
Yichun Zhang (agentzh) 0b956ca748 upgraded ngx_stream_lua to v0.0.6rc6. 6 years ago
Thibault Charbonnier 7630d23428 bumped ngx_lua to 0.10.14rc7 and lua-resty-shell to 0.02. 6 years ago
Thibault Charbonnier 60589ee251 upgraded LuaJIT to 2.1-20190221. 6 years ago
Thibault Charbonnier 94d0e8ed52 tests: bumped ngx_lua and removed lua-resty-shell/lua-resty-signal from windows builds to reflect recent changes. 7 years ago
Thibault Charbonnier b84a47de27 travis: added travis-ci support. 7 years ago
Thibault Charbonnier 72962e0125 bugfix: we now build lua-resty-signal's shared lib component. 7 years ago
Thibault Charbonnier 2e7e51e649 feature: bundled the lua-resty-signal and lua-resty-shell libraries. 7 years ago
Thibault Charbonnier 06468602b9 tests: bumped ngx_lua, ngx_stream_lua, and LuaJIT references according to recent changes. 7 years ago
Thibault Charbonnier c3b7c3b1b9 upgraded ngx_lua to 0.10.14rc4, ngx_stream_lua to 0.0.6rc4, and lua-resty-core to 0.1.16rc4. 7 years ago
Thibault Charbonnier 3f42731e50
change: we now enable the GC64 mode by default in our bundled LuaJIT build for x86_64 architectures; this can be disabled with ./configure --without-luajit-gc64. 7 years ago
Thibault Charbonnier 3c053fff33 tests: bumped lua-cjson references to 2.1.0.7rc2. 7 years ago
Thibault Charbonnier 7b290a582f feature: bundled the lua-tablepool library. 7 years ago
Yichun Zhang (agentzh) f56ee1ecd8 updated the tests to reflect recent changes. 7 years ago
Yichun Zhang (agentzh) 37a41b416c feature: ./configure: added new options --without-stream_ssl_module and --without-stream. 7 years ago
Yichun Zhang (agentzh) e8da00c337 tests: updated tests to reflect recent version changes. 7 years ago
Datong Sun 34db6fd04c configure: now supports the --without-stream_ssl_module option to disable ngx_stream_ssl_module if necessary.
Fix #388.
7 years ago
Yichun Zhang (agentzh) fe8f773b1d updated tests to reflect recent changes. 7 years ago
Yichun Zhang (agentzh) eccf26672c tests: updated sanity.t with util/fix-tests to reflect recent component version changes. 7 years ago
Yichun Zhang (agentzh) 57166863d3 updated tests to reflect recent changes. 7 years ago
Yichun Zhang (agentzh) 4a85469797 ./configure: fixed source lines exceeding 80 cols (heredoc literals are skipped). 7 years ago
Yichun Zhang (agentzh) 46a1c7adb3 feature: now the openresty build system (./configure) automatically patches the resty command-line utility to use its own nginx binary so that it does not have to compute it at runtime (which is a bit expensive).
this saves about 10ms (from for total 20ms to 10ms) for resty's startup time, as
measured on a mid-2015 MBP. That's 50% reduction in total startup time!

Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
7 years ago
Yichun Zhang (agentzh) f1ad126b75 updated tests to reflect recent changes. 7 years ago
catatsuy 031778f770 bugfix: ./configure: relative paths in --add-dynamic-module=PATH option did not work.
Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
7 years ago
Yichun Zhang (agentzh) 1555734368 updated tests to reflect recent component updates. 8 years ago
Yichun Zhang (agentzh) 94db027c12 ./configure: updated the stream subsystem related options from nginx 1.13.6.
thanks hy05190134 for the report in #334.

Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
8 years ago
Yichun Zhang (agentzh) e5767d96e9 tests: updated to reflect recent changes. 8 years ago
Yichun Zhang (agentzh) 93e9da93ec tests: fixed a test title. 8 years ago
spacewander 2cc5ba6c91 bugfix: we removed the existing Makefile even for `./configure --help`.
Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
8 years ago
Yichun Zhang (agentzh) dd46539557 updated tests to reflect recent changes. 8 years ago
Yichun Zhang (agentzh) 317dcbfa8a updated tests to reflect recent changes. 8 years ago
Yichun Zhang (agentzh) 3763c5380e feature: bundled and enabled ngx_stream_lua_module by default. this module is still experimental. 8 years ago
Yichun Zhang (agentzh) f46beb607b tests: updated the tests to reflect recent changes. 8 years ago
Yichun Zhang (agentzh) 90fc91567f bumped version to 1.11.2.5; also updated tests to reflect recent changes. 8 years ago