Skip to content
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.

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

[WIP] updates for nginx 1.15.10 #419

Closed
wants to merge 14 commits into from
Closed

[WIP] updates for nginx 1.15.10 #419

wants to merge 14 commits into from

Conversation

sawanoboly
Copy link
Collaborator

@sawanoboly sawanoboly commented Mar 27, 2019

update to latest mainline and follow changes.

Pull-Request Check List

@sawanoboly sawanoboly changed the title update test target to 1.15.10 [WIP] update test target to 1.15.10 Mar 27, 2019
@sawanoboly
Copy link
Collaborator Author

@matsumotory Build fails on the latest mainline nginx 1.15.10. Is it possible to fix?

/home/travis/build/matsumotory/ngx_mruby/src/http/ngx_http_mruby_server.c: In function ‘ngx_mrb_add_listener’:
/home/travis/build/matsumotory/ngx_mruby/src/http/ngx_http_mruby_server.c:56:29: error: request for member ‘sockaddr’ in something not a structure or union
   ngx_memcpy(&lsopt.sockaddr.sockaddr, &u.sockaddr, u.socklen);
                             ^
src/core/ngx_string.h:106:49: note: in definition of macro ‘ngx_memcpy’
 #define ngx_memcpy(dst, src, n)   (void) memcpy(dst, src, n)
                                                 ^
/home/travis/build/matsumotory/ngx_mruby/src/http/ngx_http_mruby_server.c:88:38: error: request for member ‘sockaddr’ in something not a structure or union
   (void)ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, lsopt.addr, NGX_SOCKADDR_STRLEN, 1);
                                      ^
/home/travis/build/matsumotory/ngx_mruby/src/http/ngx_http_mruby_server.c:88:69: error: ‘ngx_http_listen_opt_t’ has no member named ‘addr’
   (void)ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, lsopt.addr, NGX_SOCKADDR_STRLEN, 1);
                                                                     ^
make[2]: *** [objs/addon/http/ngx_http_mruby_server.o] Error 1
make[2]: Leaving directory `/home/travis/build/matsumotory/ngx_mruby/build/nginx-1.15.10'
make[1]: *** [build] Error 2
make[1]: Leaving directory `/home/travis/build/matsumotory/ngx_mruby/build/nginx-1.15.10'
make: *** [build_ngx_mruby] Error 2
The command "sh test.sh" exited with 2.

@sawanoboly
Copy link
Collaborator Author

@sawanoboly sawanoboly changed the title [WIP] update test target to 1.15.10 [WIP] updates for nginx 1.15.10 Mar 27, 2019
@kenhys kenhys mentioned this pull request Mar 27, 2019
32 tasks
kenhys added a commit to groonga/groonga that referenced this pull request Mar 27, 2019
This reverts commit bf4ac6b.

We need to wait until ngx_mruby supports 1.15.10.
See matsumotory/ngx_mruby#419
@sawanoboly
Copy link
Collaborator Author

ah-..

/home/travis/build/matsumotory/ngx_mruby/src/http/ngx_http_mruby_server.c:88:69: error: ‘ngx_http_listen_opt_t’ has no member named ‘addr’
(void)ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, lsopt.addr, NGX_SOCKADDR_STRLEN, 1);

nginx/nginx@release-1.15.9...release-1.15.10#diff-de2d1885ca5c2ea7a5296ce4b6d961daL104

@sawanoboly
Copy link
Collaborator Author

/home/travis/build/matsumotory/ngx_mruby/src/http/ngx_http_mruby_server.c:93:54: error: passing argument 3 of ‘ngx_sock_ntop’ from incompatible pointer type [-Werror]
   (void)ngx_sock_ntop(lsopt.sockaddr, lsopt.socklen, &lsopt.addr_text, NGX_SOCKADDR_STRLEN, 1);
                                                      ^
In file included from src/core/ngx_core.h:79:0,
                 from /home/travis/build/matsumotory/ngx_mruby/src/http/ngx_http_mruby_module.h:11,
                 from /home/travis/build/matsumotory/ngx_mruby/src/http/ngx_http_mruby_server.c:9:
src/core/ngx_inet.h:114:8: note: expected ‘u_char *’ but argument is of type ‘struct ngx_str_t *’
 size_t ngx_sock_ntop(struct sockaddr *sa, socklen_t socklen, u_char *text,
        ^

えー

@sawanoboly
Copy link
Collaborator Author

あとは @matsumotory にまかせます。。。

@matsumotory
Copy link
Owner

@sawanoboly Thank you for your trying to fix the compatibility with 1.15.10. I fixed viar #420 .

@matsumotory
Copy link
Owner

This issue was fixed via #420 Thanks!

@matsumotory matsumotory closed this Apr 3, 2019
@sawanoboly sawanoboly deleted the nginx-1-15-10 branch October 28, 2020 01:18
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