cloudflare / sslconfig

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

Refresh nginx__dynamic_tls_records.patch for nginx 1.15.4 #100

Open leonklingele opened 6 years ago

HansVanEijsden commented 5 years ago

Thanks for the patch! Unfortunately it's broken again in Nginx 1.15.8:

patching file src/event/ngx_event_openssl.c
Hunk #1 succeeded at 1272 (offset 5 lines).
Hunk #2 succeeded at 2125 (offset 9 lines).
Hunk #3 succeeded at 2267 (offset 9 lines).
patching file src/event/ngx_event_openssl.h
Hunk #2 FAILED at 107.
Hunk #3 succeeded at 117 (offset 1 line).
1 out of 3 hunks FAILED -- saving rejects to file src/event/ngx_event_openssl.h.rej

Content of the src/event/ngx_event_openssl.h.rej file:

--- src/event/ngx_event_openssl.h
+++ src/event/ngx_event_openssl.h
@@ -107,6 +116,10 @@ struct ngx_ssl_connection_s {
     unsigned                    try_early_data:1;
     unsigned                    in_early:1;
     unsigned                    early_preread:1;
+
+    ngx_ssl_dyn_rec_t           dyn_rec;
+    ngx_msec_t                  dyn_rec_last_write;
+    ngx_uint_t                  dyn_rec_records_sent;
 };
kn007 commented 5 years ago

You could using my patch: https://github.com/kn007/patch/blob/master/nginx.patch

Or fix the patch by youself like this: https://github.com/kn007/patch/commit/dc32ad5594ab8f0948315665d148bba31a56be0d

HansVanEijsden commented 5 years ago

@kn007 thank you very much. Didn't know it could be that easy. Great! 👍🏻

kn007 commented 5 years ago

@HansVanEijsden No worries. :)

leonklingele commented 5 years ago

I've opened #102 which was rebased on the latest 1.15.8 release.

kevin25 commented 5 years ago

Is there any patch for nginx 1.16?

HansVanEijsden commented 5 years ago

Is there any patch for nginx 1.16?

I use this patch with perfect results: https://raw.githubusercontent.com/kn007/patch/master/nginx.patch Edit: as already mentioned above. Still working great, also on 1.17.