Closed ggd543 closed 10 years ago
[root@10.123.76.196 ~/workspace/tengine-1.4.3$]patch -p1 < /root/workspace/nginx_ajp_module-0.2.5/ajp.patch patching file src/event/ngx_event_pipe.c Hunk #1 succeeded at 311 (offset 6 lines). patching file src/event/ngx_event_pipe.h Hunk #1 succeeded at 57 (offset -1 lines). patching file src/http/ngx_http_upstream.c Hunk #1 succeeded at 4115 (offset 266 lines). Hunk #2 FAILED at 3942. Hunk #3 FAILED at 3981. Hunk #4 succeeded at 4282 (offset 267 lines). Hunk #5 succeeded at 4315 (offset 267 lines). Hunk #6 FAILED at 4093. 3 out of 6 hunks FAILED -- saving rejects to file src/http/ngx_http_upstream.c.rej patching file src/http/ngx_http_upstream.h Hunk #1 FAILED at 85. Hunk #2 FAILED at 97. 2 out of 2 hunks FAILED -- saving rejects to file src/http/ngx_http_upstream.h.rej
see the issue7: https://github.com/yaoweibin/nginx_ajp_module/issues/7
Try the latest master revision.
[root@10.123.76.196 ~/workspace/tengine-1.4.3$]patch -p1 < /root/workspace/nginx_ajp_module-0.2.5/ajp.patch patching file src/event/ngx_event_pipe.c Hunk #1 succeeded at 311 (offset 6 lines). patching file src/event/ngx_event_pipe.h Hunk #1 succeeded at 57 (offset -1 lines). patching file src/http/ngx_http_upstream.c Hunk #1 succeeded at 4115 (offset 266 lines). Hunk #2 FAILED at 3942. Hunk #3 FAILED at 3981. Hunk #4 succeeded at 4282 (offset 267 lines). Hunk #5 succeeded at 4315 (offset 267 lines). Hunk #6 FAILED at 4093. 3 out of 6 hunks FAILED -- saving rejects to file src/http/ngx_http_upstream.c.rej patching file src/http/ngx_http_upstream.h Hunk #1 FAILED at 85. Hunk #2 FAILED at 97. 2 out of 2 hunks FAILED -- saving rejects to file src/http/ngx_http_upstream.h.rej