Skip to content

[WIP] Merge modules updating from nginx 1.15.1#1105

Merged
wangfakang merged 42 commits intoalibaba:masterfrom
chobits:master
Dec 20, 2018
Merged

[WIP] Merge modules updating from nginx 1.15.1#1105
wangfakang merged 42 commits intoalibaba:masterfrom
chobits:master

Conversation

@chobits
Copy link
Member

@chobits chobits commented Oct 9, 2018

ngx_http_access_module
ngx_http_auth_basic_module
ngx_http_auth_request_module
ngx_http_autoindex_module
ngx_http_charset_filter_module
ngx_http_index_module
ngx_http_limit_conn_module
ngx_http_flv_module
ngx_http_geo_module
ngx_http_map_module
ngx_http_not_modified_filter_module
ngx_http_xslt_filter_module
ngx_http_random_index_module
ngx_http_sub_filter_module
ngx_http_mp4_module
ngx_http_gzip_filter_module
ngx_http_static_module
ngx_http_referer_module
ngx_http_userid_filter_module
  • Also update test cases:
Nginx.pm  -- nginx test case library

auth_basic.t
autoindex_format.t
charset_gzip_static.t
limit_conn.t
geo.t
gunzip_*.t
map_*.t
not_modified*.t
xslt_params.t
sub_filter*.t
range_mp4.t
index2.t
referer.t
userid.t

  • Test case log: https://gist.github.com/chobits/1c97d29e453dd17778e02166e479dfcb
  • Case failure:
    • sub_filter_slice.t: current tengine has its slice module, so this case is not run for nginx module.
    • limit_conn_complex.t: limit_req module is not updated.
    • index2.t: current tengine does not merge http://hg.nginx.org/nginx/rev/d91a8c4ac6bb.
    • userid.t: tengine refactor 404 page. It outputs URI in response, the URI has "expires" string, which makes case failed.
  • Case fixed:
    • memcached_keepalive.t: fixed this case for Tengine via setting worker_processes 1;

chobits added 30 commits July 15, 2018 23:05
@chobits chobits changed the title Merge modules updating from nginx 1.15.1 [WIP] Merge modules updating from nginx 1.15.1 Oct 9, 2018
@chobits chobits requested a review from wangfakang October 9, 2018 03:27
fixed this case for Tengine via setting `worker_processes 1;`

$s = http_get('/req', start => 1);
SKIP: {
skip 'Tengine does not count when the variable arg_r is null ';
Copy link
Member Author

@chobits chobits Oct 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

skip failed test case for current Tengine.
When Tengine merged nginx-1.15.x completely, this case will pass.

%%TEST_GLOBALS%%

daemon off;
worker_processes 1; # NOTE: The default value of Tengine worker_processes directive is `worker_processes auto;`.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed this case for Tengine.

@chobits chobits added this to the 2.3.0 milestone Oct 9, 2018
@wangfakang
Copy link
Collaborator

ack.

@wangfakang wangfakang merged commit dbb5be0 into alibaba:master Dec 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants