cloudflare / cloudflare/sslconfig

Running nginx_1.13.1_http2_hpack.patch fails on Nginx 1.13.4

Open
#77 5 comments 0 reactions 0 assignees View on GitHub
Dominant language
No language data
Stars
1.3k
Forks
142
PR merge metrics
No merged PRs in 30d

Description

@vkrasnov I fixed the broken hunks:
```
$ diff -Naur src/http/v2/ngx_http_v2_filter_module.c.floren src/http/v2/ngx_http_v2_filter_module.c
--- src/http/v2/ngx_http_v2_filter_module.c.floren 2017-08-08 15:00:13.000000000 +0000
+++ src/http/v2/ngx_http_v2_filter_module.c 2017-08-10 15:47:40.734471424 +0000
@@ -53,10 +48,6 @@
#define NGX_HTTP_V2_NO_TRAILERS (ngx_http_v2_out_frame_t *) -1

-static u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len,
- u_char *tmp, ngx_uint_t lower);
-static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix,
- ngx_uint_t value);
static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame(
ngx_http_request_t *r, u_char *pos, u_char *end, ngx_uint_t fin);
static ngx_http_v2_out_frame_t *ngx_http_v2_create_trailers_frame(
@@ -597,23 +588,6 @@
continue;
}

-#if (NGX_DEBUG)
- if (fc->log->log_level & NGX_LOG_DEBUG_HTTP) {
- ngx_strlow(tmp, header[i].key.data, header[i].key.len);
-
- ngx_log_debug3(NGX_LOG_DEBUG_HTTP, fc->log, 0,
- "http2 output header: \"%*s: %V\"",
- header[i].key.len, tmp, &header[i].value);
- }
-#endif
-
- *pos++ = 0;
-
- pos = ngx_http_v2_write_name(pos, header[i].key.data,
- header[i].key.len, tmp);
-
- pos = ngx_http_v2_write_value(pos, header[i].value.data,
- header[i].value.len, tmp);
}

frame = ngx_http_v2_create_headers_frame(r, start, pos, r->header_only);
```
I'm attaching the patch, can you please commit it?
[nginx-1.13.4-http2-hpack.patch.zip](https://github.com/cloudflare/sslconfig/files/1215820/nginx-1.13.4-http2-hpack.patch.zip)

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.