On 27 Jul 2011 13h13 WEST, mdounin@mdounin.ru wrote:
Hello Maxim,
I haven't yet applied the patch and tested it. I just did a dry run on
a previously patched 1.0.5 using your patch set. Besides some offsets
the only issue is on the memcached module where one hunk fails.
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
|--- a/src/event/ngx_event_pipe.c
|+++ b/src/event/ngx_event_pipe.c
--------------------------
Patching file src/event/ngx_event_pipe.c using Plan A...
Hunk #1 succeeded at 392.
Hunk #2 succeeded at 870.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/event/ngx_event_pipe.h b/src/event/ngx_event_pipe.h
|--- a/src/event/ngx_event_pipe.h
|+++ b/src/event/ngx_event_pipe.h
--------------------------
Patching file src/event/ngx_event_pipe.h using Plan A...
Hunk #1 succeeded at 65.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
|--- a/src/http/modules/ngx_http_fastcgi_module.c
|+++ b/src/http/modules/ngx_http_fastcgi_module.c
--------------------------
Patching file src/http/modules/ngx_http_fastcgi_module.c using Plan A...
Hunk #1 succeeded at 77.
Hunk #2 succeeded at 132.
Hunk #3 succeeded at 487.
Hunk #4 succeeded at 603.
Hunk #5 succeeded at 1590 (offset 19 lines).
Hunk #6 succeeded at 1638 (offset 19 lines).
Hunk #7 succeeded at 1648 (offset 19 lines).
Hunk #8 succeeded at 1808 (offset 19 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
|--- a/src/http/modules/ngx_http_memcached_module.c
|+++ b/src/http/modules/ngx_http_memcached_module.c
--------------------------
Patching file src/http/modules/ngx_http_memcached_module.c using Plan A...
Hunk #1 FAILED at 344.
Hunk #2 succeeded at 411 (offset 45 lines).
Hunk #3 succeeded at 472 (offset 45 lines).
Hunk #4 succeeded at 513 (offset 45 lines).
Hunk #5 succeeded at 527 (offset 45 lines).
1 out of 5 hunks FAILED -- saving rejects to file src/http/modules/ngx_http_memcached_module.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
|--- a/src/http/modules/ngx_http_proxy_module.c
|+++ b/src/http/modules/ngx_http_proxy_module.c
--------------------------
Patching file src/http/modules/ngx_http_proxy_module.c using Plan A...
Hunk #1 succeeded at 71.
Hunk #2 succeeded at 82.
Hunk #3 succeeded at 100.
Hunk #4 succeeded at 174.
Hunk #5 succeeded at 456.
Hunk #6 succeeded at 510.
Hunk #7 succeeded at 518.
Hunk #8 succeeded at 643.
Hunk #9 succeeded at 902.
Hunk #10 succeeded at 1051.
Hunk #11 succeeded at 1207.
Hunk #12 succeeded at 1297.
Hunk #13 succeeded at 1394.
Hunk #14 succeeded at 1428.
Hunk #15 succeeded at 2460.
Hunk #16 succeeded at 2763.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
|--- a/src/http/ngx_http_upstream.c
|+++ b/src/http/ngx_http_upstream.c
--------------------------
Patching file src/http/ngx_http_upstream.c using Plan A...
Hunk #1 succeeded at 72.
Hunk #2 succeeded at 91.
Hunk #3 succeeded at 101.
Hunk #4 succeeded at 152.
Hunk #5 succeeded at 250.
Hunk #6 succeeded at 406 (offset 3 lines).
Hunk #7 succeeded at 810 (offset 3 lines).
Hunk #8 succeeded at 1293 (offset 3 lines).
Hunk #9 succeeded at 1938 (offset 3 lines).
Hunk #10 succeeded at 2004 (offset 3 lines).
Hunk #11 succeeded at 2310 (offset 3 lines).
Hunk #12 succeeded at 2411 (offset 3 lines).
Hunk #13 succeeded at 2430 (offset 3 lines).
Hunk #14 succeeded at 2526 (offset 3 lines).
Hunk #15 succeeded at 3076 (offset -7 lines).
Hunk #16 succeeded at 3369 (offset 10 lines).
Hunk #17 succeeded at 3493 (offset 10 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
|--- a/src/http/ngx_http_upstream.h
|+++ b/src/http/ngx_http_upstream.h
--------------------------
Patching file src/http/ngx_http_upstream.h using Plan A...
Hunk #1 succeeded at 219 (offset 3 lines).
Hunk #2 succeeded at 228 (offset 3 lines).
Hunk #3 succeeded at 272 (offset 3 lines).
Hunk #4 succeeded at 313 (offset 3 lines).
done
--- appa
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
