Commit Graph

412 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 cef09e553f
upgraded the nginx core to 1.17.1. 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
Yichun Zhang (agentzh) 2b40d7b8ee bumped version to 1.15.8.1. 6 years ago
Yichun Zhang (agentzh) 540567e42c bumped version to 1.15.8.1 RC2. 6 years ago
Yichun Zhang (agentzh) eff3e0d7db bumped version to 1.15.8.1 RC1. 6 years ago
Yichun Zhang (agentzh) 8c8d51663e upgraded the nginx core 1.15.8. 6 years ago
Yichun Zhang (agentzh) b91001a87e upgraded the nginx core to 1.15.6. 7 years ago
Yichun Zhang (agentzh) f58e6eb013 upgraded the nginx core to 1.15.5. 7 years ago
Yichun Zhang (agentzh) 4f0980829a bumped version to 1.13.6.2. 7 years ago
Yichun Zhang (agentzh) 17d6683267 bumped version to 1.13.6.2rc1. 7 years ago
Yichun Zhang (agentzh) d5c201c051 bumped version to 1.13.6.2rc0. 8 years ago
Yichun Zhang (agentzh) d2618c3135 formal release 1.13.6.1. 8 years ago
Yichun Zhang (agentzh) a1444be0bf bumped version to 1.13.6.1 RC1. 8 years ago
Yichun Zhang (agentzh) a1109b8dd2 upgraded the nginx core to 1.13.6. 8 years ago
Yichun Zhang (agentzh) 4eae6e2415 upgraded the nginx core to 1.13.5. 8 years ago
Yichun Zhang (agentzh) 3e2540f6a0 upgraded nginx core to 1.13.4. 8 years ago
Yichun Zhang (agentzh) 6237430ef4 upgraded nginx core to 1.13.3. 8 years ago
Yichun Zhang (agentzh) 6614441908 upgraded the nginx core to 1.13.2 (some patches fail to apply though). 8 years ago
Yichun Zhang (agentzh) 90fc91567f bumped version to 1.11.2.5; also updated tests to reflect recent changes. 8 years ago
Yichun Zhang (agentzh) a0f6653c6a bumped version to 1.11.2.5 RC1. 8 years ago
Yichun Zhang (agentzh) f9a2702f5a merged openresty 1.11.2.4. 8 years ago
Yichun Zhang (agentzh) 58f39e963f bugfix: applied nginx's official security fix for an issue in the range filter (CVE-2017-7529). 8 years ago
Yichun Zhang (agentzh) 5426551809 upgraded lua-resty-mysql to 0.20rc1. 8 years ago
Yichun Zhang (agentzh) bcb9b3b698 upgraded ngx_upstream_lua to 0.07rc1; upgraded lua-resty-string to 0.10rc1; upgraded lua-resty-lock to 0.07rc1; upgraded lua-resty-core to 0.1.12rc5. 8 years ago
Yichun Zhang (agentzh) d94772353a upgraded LuaJIT to v2.1-20170517. 8 years ago
Yichun Zhang (agentzh) d7da4d6037 upgraded ngx_lua to 0.10.9rc5. 8 years ago
Yichun Zhang (agentzh) 706dee9b7f bumped version to 1.11.2.4 rc0.3. 8 years ago
Yichun Zhang (agentzh) 0ed12d446c upgraded ngx_lua to 0.10.9rc4. 8 years ago
Yichun Zhang (agentzh) 6b905f9eef bumped version to 1.11.2.4 RC0.1. 8 years ago
Yuansheng 79dc3c56aa feature: applied a small patch to the nginx core to add support for the "privileged agent" process which is run by the same system account as the master.
Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
8 years ago
Yichun Zhang (agentzh) 391709ce4d formal release 1.11.2.3. 8 years ago
Yichun Zhang (agentzh) df41967474 bumped version to 1.11.2.3rc0. 8 years ago
Yichun Zhang (agentzh) b03099b386 bumped version to 1.11.2.2. 9 years ago
Yichun Zhang (agentzh) e254c3d0c1 change: now we enable -DLUAJIT_ENABLE_LUA52COMPAT in our bundled LuaJIT build by default, which can be disabled by ./configure --without-luajit-lua52. 9 years ago
Yichun Zhang (agentzh) 8ffd932b20 added lua-resty-limit-traffic. 9 years ago
Yichun Zhang (agentzh) 7571924cd2 bumped version to 1.11.2.1. 9 years ago
Yichun Zhang (agentzh) edcdb450f4 bumped version to 1.11.2.1 RC1. 9 years ago
Yichun Zhang (agentzh) 09ca92f51f upgraded the nginx core to 1.11.2. 9 years ago
Yichun Zhang (agentzh) 7c274e056e feature: added the upstream_timeout_fields patch to the nginx core to allow per-request connect/send/read timeout settings for individual upstream requests and retries. 9 years ago
Yichun Zhang (agentzh) d3506c60aa bumped version to 1.9.15.1. 9 years ago
Yichun Zhang (agentzh) d6a8907fc0 resolved conflicts while merging the branch 1.9.7.x into master. 9 years ago
Yichun Zhang (agentzh) bf47ba9529 bugfix: applied the patch for nginx security advisory (CVE-2016-4450).
also bumped version to 1.9.7.5.
9 years ago
Yichun Zhang (agentzh) a924c2d9aa bumped version to 1.9.15.1 RC2. 9 years ago
Yichun Zhang (agentzh) 665faf0aea version 1.9.15.1 RC1. 9 years ago
Yichun Zhang (agentzh) 86be514b1c upgraded the nginx core to 1.9.15. 9 years ago
Yichun Zhang (agentzh) 3041624fbc release 1.9.7.4. 9 years ago
Yichun Zhang (agentzh) de75e4d7ed version 1.9.7.4 RC1. 9 years ago
Yichun Zhang (agentzh) e4cfb92295 downgrade to 1.9.7.4rc0 since the new 1.9.11+ nginx cores have pending compatibility issues that require more time to fix. 9 years ago
Yichun Zhang (agentzh) 5f7f678876 upgraded the NGINX core to 1.9.11 and ngx_lua to 0.10.1rc0. 9 years ago