Commit Graph

10 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 547fdd5fb2 bugfix: Config.pm: fixed an issue when generating t/sanity.t_. 6 years ago
Thibault Charbonnier 73c881bddf tests: added support for `--- out_like` blocks. 7 years ago
Yichun Zhang (agentzh) 52962f3fc9 renamed ngx_openresty to openresty. 10 years ago
Yichun Zhang (agentzh) 6a17d2c784 bugfix: ./configure --prefix=PATH did not work when PATH is relative. also added experimental support for the MinGW MSYS environment on Win32. 10 years ago
agentzh (章亦春) af701e5b64 improved Yao Weibin's patch for the --add-module option a bit and also added a test case. 14 years ago
agentzh (章亦春) 030ffab7d2 now we bundle the lua-redis-parser library with us and it is enabled by default. tested on Linux i386, Linux x86_64, Mac OS X, FreeBSD 8.2 i386, and Solaris 11; added the new option --without-lua_redis_parser to the ./configure script; made the test scaffold emit .t_ file with actual outputs as the expected outputs; released ngx_openresty 1.0.5.0rc3. 14 years ago
agentzh (章亦春) 84989d2d28 now we also test the generated makefiles in our test suite. 15 years ago
agentzh (章亦春) 215f852bc2 added a test for --with-luajit. 15 years ago
agentzh (章亦春) 824c7a4617 added test scaffold t::Config. 15 years ago