healthcheck_nginx_upstreams patch fails for Nginx 1.2.1

[Markus Jelsma]

Hello,

We tried to test the new Nginx 1.2.1 release but we're using the healthcheck_nginx_upstreams module [1]. With Nginx 1.1.x and 1.2.0 we could succesfully apply the Healthcheck module patch but hunks fail for Nginx 1.2.1. Any hints on what we can do about it?

# patch --dry-run -p1 < nginx.patch 
patching file src/http/ngx_http_upstream.c
Hunk #1 succeeded at 4403 (offset 110 lines).
patching file src/http/ngx_http_upstream.h
Hunk #1 succeeded at 110 (offset 1 line).
patching file src/http/ngx_http_upstream_round_robin.c
Hunk #1 succeeded at 5 (offset 1 line).
Hunk #2 FAILED at 14.
Hunk #3 succeeded at 35 (offset 1 line).
Hunk #4 succeeded at 77 (offset 8 lines).
Hunk #5 succeeded at 399 (offset 11 lines).
Hunk #6 FAILED at 434.
Hunk #7 FAILED at 495.
Hunk #8 FAILED at 600.
Hunk #9 FAILED at 625.
Hunk #10 FAILED at 645.
6 out of 10 hunks FAILED -- saving rejects to file src/http/ngx_http_upstream_round_robin.c.rej
patching file src/http/ngx_http_upstream_round_robin.h
Hunk #1 succeeded at 29 (offset 3 lines)

[1]: https://github.com/cep21/healthcheck_nginx_upstreams

Thanks,
Markus