Valentin V. Bartenev
vbart at nginx.com
Wed Nov 28 10:54:02 UTC 2012
On Wednesday 28 November 2012 13:45:54 Christoph Schug wrote:
> On 2012-11-27 23:32, Valentin V. Bartenev wrote:
> > Don't worry, it's indeed minor adjustments while applying.
> > It should work as well as with the previous nginx version.
> Great, thanks for confirmation. If anyone is interested for reasons of
> convenience, I applied the patch to nginx 1.3.9, resolved the rejects
> and did a fresh unified diff.
Rejects? Are you sure? Could you show me them? Because I see only some
small offsets and two little fuzz:
vbart at vbart-laptop nginx-1.3.9 % patch -p0 < patch.spdy.txt
patching file src/http/ngx_http_spdy.h
patching file src/http/ngx_http.h
Hunk #1 succeeded at 24 (offset 1 line).
Hunk #2 succeeded at 39 (offset 1 line).
Hunk #3 succeeded at 94 (offset 8 lines).
Hunk #4 succeeded at 113 with fuzz 1 (offset 10 lines).
Hunk #5 succeeded at 121 (offset 10 lines).
patching file src/http/ngx_http_parse.c
patching file src/http/modules/ngx_http_ssl_module.c
patching file src/http/modules/ngx_http_limit_req_module.c
patching file src/http/ngx_http_spdy_module.c
patching file src/http/ngx_http_request.c
Hunk #10 succeeded at 1986 (offset 3 lines).
Hunk #11 succeeded at 3138 (offset 3 lines).
patching file src/http/ngx_http_spdy_filter_module.c
patching file src/http/ngx_http_spdy_module.h
patching file src/http/ngx_http_request.h
Hunk #1 succeeded at 270 (offset 1 line).
Hunk #2 succeeded at 423 (offset 3 lines).
patching file src/http/ngx_http_core_module.c
Hunk #1 succeeded at 2130 (offset 1 line).
Hunk #2 succeeded at 4082 (offset 1 line).
patching file src/http/ngx_http_upstream.c
patching file src/http/ngx_http_core_module.h
patching file src/http/ngx_http_request_body.c
Hunk #1 succeeded at 41 with fuzz 2 (offset 2 lines).
Hunk #2 succeeded at 476 (offset 5 lines).
patching file src/http/ngx_http_spdy.c
patching file src/http/ngx_http.c
patching file auto/sources
patching file auto/options
patching file auto/modules
wbr, Valentin V. Bartenev
More information about the nginx