Skip to content

Commit c5c6b54

Browse files
authored
Update nginx-spdy-1.11.5+.patch
1 parent 0ef56a5 commit c5c6b54

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

nginx-spdy-1.11.5+.patch

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -321,23 +321,27 @@ diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
321321
index 19cb680..7d443c1 100644
322322
--- a/src/http/ngx_http.h
323323
+++ b/src/http/ngx_http.h
324-
@@ -23,6 +23,9 @@ typedef struct ngx_http_chunked_s ngx_http_chunked_t;
325-
#if (NGX_HTTP_V2)
326-
typedef struct ngx_http_v2_stream_s ngx_http_v2_stream_t;
327-
#endif
324+
@@ -19,6 +19,9 @@
325+
typedef struct ngx_http_file_cache_s ngx_http_file_cache_t;
326+
typedef struct ngx_http_log_ctx_s ngx_http_log_ctx_t;
327+
typedef struct ngx_http_chunked_s ngx_http_chunked_t;
328328
+#if (NGX_HTTP_SPDY)
329329
+typedef struct ngx_http_spdy_stream_s ngx_http_spdy_stream_t;
330330
+#endif
331+
typedef struct ngx_http_v2_stream_s ngx_http_v2_stream_t;
331332

332333
typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r,
333-
ngx_table_elt_t *h, ngx_uint_t offset);
334-
@@ -38,9 +38,6 @@
334+
@@ -35,9 +38,13 @@
335+
#include <ngx_http_upstream_round_robin.h>
336+
#include <ngx_http_core_module.h>
337+
338+
+
335339
#if (NGX_HTTP_V2)
336340
#include <ngx_http_v2.h>
337341
#endif
338-
-#if (NGX_HTTP_SPDY)
339-
-#include <ngx_http_spdy.h>
340-
-#endif
342+
+#if (NGX_HTTP_SPDY)
343+
+#include <ngx_http_spdy.h>
344+
+#endif
341345
#if (NGX_HTTP_CACHE)
342346
#include <ngx_http_cache.h>
343347
#endif
@@ -393,20 +397,20 @@ diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
393397
index 6c446a0..434d33e 100644
394398
--- a/src/http/ngx_http_core_module.h
395399
+++ b/src/http/ngx_http_core_module.h
396-
@@ -82,6 +82,9 @@ typedef struct {
397-
#if (NGX_HTTP_V2)
400+
@@ -69,6 +69,9 @@
401+
unsigned wildcard:1;
402+
unsigned ssl:1;
398403
unsigned http2:1;
399-
#endif
400404
+#if (NGX_HTTP_SPDY)
401405
+ unsigned spdy:1;
402406
+#endif
403-
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
407+
#if (NGX_HAVE_INET6)
404408
unsigned ipv6only:1;
405409
#endif
406-
@@ -251,6 +254,9 @@ struct ngx_http_addr_conf_s {
407-
#if (NGX_HTTP_V2)
410+
@@ -230,6 +233,9 @@
411+
412+
unsigned ssl:1;
408413
unsigned http2:1;
409-
#endif
410414
+#if (NGX_HTTP_SPDY)
411415
+ unsigned spdy:1;
412416
+#endif

0 commit comments

Comments
 (0)