[GitHub] [incubator-apisix] totemofwolf commented on issue #912: add two new patches for Tengine case

[GitBox <gi...@apache.org>]

totemofwolf commented on issue #912: add two new patches for Tengine case
URL: https://github.com/apache/incubator-apisix/issues/912#issuecomment-559330467
 
 
   I already patched this file `nginx-1.17.4-resolver_conf_parsing.patch` in travis ci shell script
   
   ```
   ➜  tengine-2.3.2 patch -p1 < ../patches/nginx-1.17.4-resolver_conf_parsing.patch
   patching file src/core/ngx_resolver.c
   Hunk #2 succeeded at 284 (offset 139 lines).
   Hunk #3 succeeded at 601 with fuzz 2 (offset 156 lines).
   ```
   
   But another file `nginx-1.17.4-privileged_agent_process.patch` failed to patch:
   
   ```
   ➜  tengine-2.3.2 patch -p1 < ../nginx-1.17.4-privileged_agent_process.patch
   patching file src/core/nginx.c
   Hunk #1 succeeded at 1096 with fuzz 2 (offset 115 lines).
   Hunk #2 succeeded at 1126 with fuzz 2 (offset 116 lines).
   patching file src/core/ngx_cycle.h
   Hunk #2 succeeded at 96 with fuzz 1 (offset 12 lines).
   patching file src/os/unix/ngx_process_cycle.c
   Hunk #1 succeeded at 19 (offset 4 lines).
   Hunk #2 succeeded at 30 (offset 4 lines).
   Hunk #3 succeeded at 59 (offset 5 lines).
   Hunk #4 succeeded at 143 with fuzz 2 (offset 8 lines).
   Hunk #5 FAILED at 238.
   Hunk #6 succeeded at 275 with fuzz 2 (offset 25 lines).
   Hunk #7 FAILED at 290.
   Hunk #8 succeeded at 470 (offset 37 lines).
   Hunk #9 succeeded at 923 (offset 59 lines).
   Hunk #10 succeeded at 1290 with fuzz 1 (offset 106 lines).
   2 out of 10 hunks FAILED -- saving rejects to file src/os/unix/ngx_process_cycle.c.rej
   patching file src/os/unix/ngx_process_cycle.h
   Hunk #1 succeeded at 56 (offset 11 lines).
   
   ```
   
   Issues has been report to https://github.com/alibaba/tengine/issues/1397 already.
   
   
   
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services