Skip to content

feature: update nginx to v1.28.0. #1045

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Conversation

devhaozi
Copy link
Contributor

@devhaozi devhaozi commented Apr 17, 2025

  1. Update nginx core to v1.28.0.
  2. Update pcre2 to 10.25.
  3. Add travis_wait to fix ci timeout.

Closes #1051
Closes #1046
Closes #1029
Closes #1023
Closes #976
Closes #959
Closes #929
Closes #741
Closes #745

I hereby granted the copyright of the changes in this pull request
to the authors of this openresty project.

@kkmuffme
Copy link

Closes #1046

@spacexnasa
Copy link

https://nginx.org/en/CHANGES-1.28

@devhaozi devhaozi changed the title feature: update nginx to v1.27.5. feature: update nginx to v1.28.0. May 2, 2025
@devhaozi
Copy link
Contributor Author

devhaozi commented May 6, 2025

Ready for review, cc @zhuizhuhaomeng

@travisbell
Copy link

Getting to close #1023 will be huge!

@melroy89
Copy link

Finally!

@spacexnasa
Copy link

这个补丁编译可以通过,但是 gmake 会出错 --with-mail --with-mail_ssl_module 主要是添加了这两个,去掉就好了

src/mail/ngx_mail_proxy_module.c: In function ‘ngx_mail_proxy_send_proxy_protocol’:
src/mail/ngx_mail_proxy_module.c:906:9: error: too few arguments to function ‘ngx_proxy_protocol_write’
p = ngx_proxy_protocol_write(s->connection, buf,
^~~~~~~~~~~~~~~~~~~~~~~~
In file included from src/core/ngx_core.h:98:0,
from src/mail/ngx_mail_proxy_module.c:9:
src/core/ngx_proxy_protocol.h:31:9: note: declared here
u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf,
^~~~~~~~~~~~~~~~~~~~~~~~
gmake[2]: *** [objs/Makefile:2361: objs/src/mail/ngx_mail_proxy_module.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....

@HanadaLee
Copy link

这个补丁编译可以通过,但是 gmake 会出错 --with-mail --with-mail_ssl_module 主要是添加了这两个,去掉就好了

src/mail/ngx_mail_proxy_module.c: In function ‘ngx_mail_proxy_send_proxy_protocol’: src/mail/ngx_mail_proxy_module.c:906:9: error: too few arguments to function ‘ngx_proxy_protocol_write’ p = ngx_proxy_protocol_write(s->connection, buf, ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from src/core/ngx_core.h:98:0, from src/mail/ngx_mail_proxy_module.c:9: src/core/ngx_proxy_protocol.h:31:9: note: declared here u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, ^~~~~~~~~~~~~~~~~~~~~~~~ gmake[2]: *** [objs/Makefile:2361: objs/src/mail/ngx_mail_proxy_module.o] Error 1 gmake[2]: *** Waiting for unfinished jobs....

最近openresty引入支持proxy_protocol_v2的补丁导致的,补丁改了core里的ngx_proxy_protocol_write,但是忘记给mail模块调用函数打补丁了 @zhuizhuhaomeng
#1043
5fdebe7
https://github.com/openresty/openresty/pull/1045/files#diff-8cab3b5bba90f91915be8c8a08c368c3846fadfe7f13137609a02ec6be6794dc

@zhuizhuhaomeng
Copy link
Contributor

We will fix this issue

@devhaozi
Copy link
Contributor Author

devhaozi commented Jun 1, 2025

这个补丁编译可以通过,但是 gmake 会出错 --with-mail --with-mail_ssl_module 主要是添加了这两个,去掉就好了

src/mail/ngx_mail_proxy_module.c: In function ‘ngx_mail_proxy_send_proxy_protocol’: src/mail/ngx_mail_proxy_module.c:906:9: error: too few arguments to function ‘ngx_proxy_protocol_write’ p = ngx_proxy_protocol_write(s->connection, buf, ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from src/core/ngx_core.h:98:0, from src/mail/ngx_mail_proxy_module.c:9: src/core/ngx_proxy_protocol.h:31:9: note: declared here u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, ^~~~~~~~~~~~~~~~~~~~~~~~ gmake[2]: *** [objs/Makefile:2361: objs/src/mail/ngx_mail_proxy_module.o] Error 1 gmake[2]: *** Waiting for unfinished jobs....

拉一下最新的代码试试,加了个补丁

@spacexnasa
Copy link

这个补丁编译可以通过,但是 gmake 会出错 --with-mail --with-mail_ssl_module 主要是添加了这两个,去掉就好了
src/mail/ngx_mail_proxy_module.c: In function ‘ngx_mail_proxy_send_proxy_protocol’: src/mail/ngx_mail_proxy_module.c:906:9: error: too few arguments to function ‘ngx_proxy_protocol_write’ p = ngx_proxy_protocol_write(s->connection, buf, ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from src/core/ngx_core.h:98:0, from src/mail/ngx_mail_proxy_module.c:9: src/core/ngx_proxy_protocol.h:31:9: note: declared here u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, ^~~~~~~~~~~~~~~~~~~~~~~~ gmake[2]: *** [objs/Makefile:2361: objs/src/mail/ngx_mail_proxy_module.o] Error 1 gmake[2]: *** Waiting for unfinished jobs....

拉一下最新的代码试试,加了个补丁

好了,刚测试了,非常感谢!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment