Spdy patch & hpack patch could not work together

[S8Cloud]

My nginx version 1.13.5

• First I tried to patch Spdy patch and it works well

  patch -p1 < ../sslconfig/patches/nginx__1.13.0_http2_spdy.patchpatching file auto/modules                                                                                  patching file auto/options                                                                                  Hunk #2 succeeded at 223 (offset 1 line).                                                                   Hunk #3 succeeded at 434 (offset 2 lines).                                                                  patching file src/core/ngx_connection.h                                                                     patching file src/http/modules/ngx_http_ssl_module.c                                                        Hunk #1 succeeded at 352 (offset 4 lines).                                                                  Hunk #2 succeeded at 369 (offset 4 lines).                                                                  Hunk #3 succeeded at 390 (offset 4 lines).                                                                  Hunk #4 succeeded at 424 (offset 4 lines).                                                                  Hunk #5 succeeded at 457 (offset 4 lines).                                                                  patching file src/http/ngx_http.c                                                                           Hunk #1 succeeded at 1199 (offset -3 lines).
  Hunk #2 succeeded at 1237 (offset -3 lines).
  Hunk #3 succeeded at 1274 (offset -3 lines).
  Hunk #4 succeeded at 1320 (offset -3 lines).
  Hunk #5 succeeded at 1825 (offset -3 lines).
  Hunk #6 succeeded at 1893 (offset -3 lines).
  patching file src/http/ngx_http.h
  ......

• But when I tried to patch hpack, it shows FAILED

  patch -p1 < ../sslconfig/patches/nginx_1.13.1_http2_hpack.patchpatching file auto/modules                                                                                  Hunk #1 succeeded at 464 (offset 28 lines).                                                                 patching file auto/options                                                                                  Hunk #1 FAILED at 59.                                                                                       Hunk #2 FAILED at 221.                                                                                      Hunk #3 FAILED at 430.                                                                                      3 out of 3 hunks FAILED -- saving rejects to file auto/options.rej                                          patching file src/core/ngx_murmurhash.c                                                                     patching file src/core/ngx_murmurhash.h                                                                     patching file src/http/v2/ngx_http_v2.c                                                                     Hunk #2 succeeded at 2020 (offset 5 lines).                                                                 patching file src/http/v2/ngx_http_v2.h                                                                     Hunk #5 succeeded at 401 (offset 9 lines).
  patching file src/http/v2/ngx_http_v2_filter_module.c
  Hunk #2 succeeded at 48 with fuzz 2 (offset 2 lines).
  Hunk #3 succeeded at 133 (offset 4 lines).
  Hunk #4 succeeded at 142 (offset 4 lines).
  Hunk #5 succeeded at 405 (offset 4 lines).
  Hunk #6 succeeded at 413 (offset 4 lines).
  Hunk #7 succeeded at 433 (offset 4 lines).
  Hunk #8 succeeded at 480 (offset 4 lines).
  Hunk #9 succeeded at 532 with fuzz 1 (offset 4 lines).
  Hunk #10 succeeded at 674 (offset 116 lines).
  Hunk #11 succeeded at 700 (offset 116 lines).
  patching file src/http/v2/ngx_http_v2_table.c

  In this case I can use -with-http_v2_hpack_enc in the building configuration but could not use --with-http_spdy_module

I tried to patch spdy first and then hpack, it failed again and I can not use flag -with-http_v2_hpack_enc when building nginx 1.13.5

[kn007]

patch hpack first, then patch spdy manual or your may edit the patch file to patch.

---

用中文跟你解释一下吧。因为你patch了任意一个，都会新增了参数，比如--with-http_v2_hpack_enc或--with-http_spdy_module，这时候另外一个patch就会判断跟原始结构不一致，出现问题。

建议呢，先打hpack，因为改动比较大，又有新增函数。然后再手动打下spdy，照着patch文件。就可以了。

[kn007]

Your could using this patch to fix it: https://raw.githubusercontent.com/kn007/patch/master/nginx.patch Test pass on nginx 1.13.6