search

cloudflare / sslconfig

Cloudflare's Internet facing SSL configuration
BSD 3-Clause "New" or "Revised" License
1.3k stars 132 forks source link

Update Nginx patches to version 1.11.6 #53

Open zawn opened 7 years ago

zawn commented 7 years ago

Update Nginx patches to version 1.11.6

injust commented 7 years ago

All 3 patches (dynamic TLS records, SPDY, and ChaCha20-Poly1305) that work for nginx 1.11.5 work for 1.11.6 already.

zawn commented 7 years ago

[root@localhost nginx]# patch -p1 < ../nginx__1.11.5_dynamic_tls_records.patch patching file src/event/ngx_event_openssl.c patching file src/event/ngx_event_openssl.h patching file src/http/modules/ngx_http_ssl_module.c Hunk #2 succeeded at 574 (offset 6 lines). Hunk #3 succeeded at 644 (offset 6 lines). Hunk #4 succeeded at 838 (offset 6 lines). patching file src/http/modules/ngx_http_ssl_module.h

There is a text line offset, but can be used

lenovouser commented 7 years ago

@Injust nope, the SPDY patch doesn't work for the 1.11.6

injust commented 7 years ago

@lenovouser https://github.com/cujanovic/nginx-http2-spdy-patch/blob/master/nginx-spdy-1.11.5+.patch works for 1.11.5 as it does for 1.11.6

lenovouser commented 7 years ago

@Injust nope, see cujanovic/nginx-http2-spdy-patch/issues/1 and

lenovouser commented 7 years ago

https://github.com/cloudflare/sslconfig/pull/36#issuecomment-262661006

amirymk commented 7 years ago

Hello,

There is a problem with theis patch when it is applied to nginx version 1.11.11 [root@server nginx-1.11.11]# patch -p1 < ./nginx-spdy-1.11.5+.patch patching file auto/modules Hunk #1 FAILED at 139. Hunk #2 FAILED at 171. Hunk #3 FAILED at 232. Hunk #4 FAILED at 440. 4 out of 4 hunks FAILED -- saving rejects to file auto/modules.rej patching file auto/options

Please modify the patch and fix these errors .

injust commented 7 years ago

Added new versions in #63

injust commented 6 years ago

@zawn Can this be closed yet?