Mercurial > hg > nginx
annotate src/http/ngx_http.h @ 4248:2fad4d19ea4b stable-1.0
Merging r4151, r4152, r4177:
HTTP cache related fixes:
*) Cache: fix for sending of empty responses.
Revert wrong fix for empty responses introduced in 0.8.31 and apply new
one, rewritten to match things done by static module as close as possible.
*) Cache: fix for sending of stale responses.
For normal cached responses ngx_http_cache_send() sends last buffer and then
request finalized via ngx_http_finalize_request() call, i.e. everything is
ok.
But for stale responses (i.e. when upstream died, but we have something in
cache) the same ngx_http_cache_send() sends last buffer, but then in
ngx_http_upstream_finalize_request() another last buffer is send. This
causes duplicate final chunk to appear if chunked encoding is used (and
resulting problems with keepalive connections and so on).
Fix this by not sending in ngx_http_upstream_finalize_request()
another last buffer if we know response was from cache.
*) Fixed cache bypass caching of non-cacheable replies (ticket #21).
If cache was bypassed with proxy_cache_bypass, cache-controlling headers
(Cache-Control, Expires) wasn't considered and response was cached even
if it was actually non-cacheable.
Patch by John Ferlito.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 01 Nov 2011 13:49:31 +0000 |
| parents | c1e3cb4c669c |
| children | e5df04b05e75 4919fb357a5d |
| rev | line source |
|---|---|
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
432
diff
changeset
|
1 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
432
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
432
diff
changeset
|
4 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
432
diff
changeset
|
5 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
432
diff
changeset
|
6 |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 #ifndef _NGX_HTTP_H_INCLUDED_ |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #define _NGX_HTTP_H_INCLUDED_ |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 #include <ngx_config.h> |
|
100
7ebc8b7fb816
nginx-0.0.1-2003-06-03-19:42:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
12 #include <ngx_core.h> |
|
190
02a715e85df1
nginx-0.0.1-2003-11-19-00:34:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
178
diff
changeset
|
13 |
| 509 | 14 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2589
diff
changeset
|
15 typedef struct ngx_http_request_s ngx_http_request_t; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2589
diff
changeset
|
16 typedef struct ngx_http_upstream_s ngx_http_upstream_t; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2589
diff
changeset
|
17 typedef struct ngx_http_cache_s ngx_http_cache_t; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2589
diff
changeset
|
18 typedef struct ngx_http_file_cache_s ngx_http_file_cache_t; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2589
diff
changeset
|
19 typedef struct ngx_http_log_ctx_s ngx_http_log_ctx_t; |
| 509 | 20 |
| 21 typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r, | |
| 22 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 665 | 23 typedef u_char *(*ngx_http_log_handler_pt)(ngx_http_request_t *r, |
| 24 ngx_http_request_t *sr, u_char *buf, size_t len); | |
| 501 | 25 |
|
197
0b81c7a0b133
nginx-0.0.1-2003-11-27-10:45:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
191
diff
changeset
|
26 |
| 509 | 27 #include <ngx_http_variables.h> |
| 28 #include <ngx_http_request.h> | |
| 479 | 29 #include <ngx_http_upstream.h> |
| 884 | 30 #include <ngx_http_upstream_round_robin.h> |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
91
diff
changeset
|
31 #include <ngx_http_config.h> |
|
174
ea464a6c0581
nginx-0.0.1-2003-11-05-01:12:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
170
diff
changeset
|
32 #include <ngx_http_busy_lock.h> |
|
2589
859f6675a553
use complex value in error_page
Igor Sysoev <igor@sysoev.ru>
parents:
2578
diff
changeset
|
33 #include <ngx_http_script.h> |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
91
diff
changeset
|
34 #include <ngx_http_core_module.h> |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
35 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2589
diff
changeset
|
36 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2589
diff
changeset
|
37 #include <ngx_http_cache.h> |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2589
diff
changeset
|
38 #endif |
| 597 | 39 #if (NGX_HTTP_SSI) |
| 40 #include <ngx_http_ssi_filter_module.h> | |
| 41 #endif | |
|
395
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
392
diff
changeset
|
42 #if (NGX_HTTP_SSL) |
|
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
392
diff
changeset
|
43 #include <ngx_http_ssl_module.h> |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
356
diff
changeset
|
44 #endif |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
356
diff
changeset
|
45 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
24
diff
changeset
|
46 |
| 479 | 47 struct ngx_http_log_ctx_s { |
| 1810 | 48 ngx_connection_t *connection; |
| 461 | 49 ngx_http_request_t *request; |
| 665 | 50 ngx_http_request_t *current_request; |
| 479 | 51 }; |
|
6
669801705ab1
nginx-0.0.1-2002-08-26-19:18:19 import
Igor Sysoev <igor@sysoev.ru>
parents:
4
diff
changeset
|
52 |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
53 |
| 3626 | 54 typedef struct { |
| 55 ngx_uint_t code; | |
| 56 ngx_uint_t count; | |
| 57 u_char *start; | |
| 58 u_char *end; | |
| 59 } ngx_http_status_t; | |
| 60 | |
| 61 | |
| 675 | 62 #define ngx_http_get_module_ctx(r, module) (r)->ctx[module.ctx_index] |
| 63 #define ngx_http_set_ctx(r, c, module) r->ctx[module.ctx_index] = c; | |
|
9
6f58641241bb
nginx-0.0.1-2002-09-07-14:14:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
8
diff
changeset
|
64 |
|
6f58641241bb
nginx-0.0.1-2002-09-07-14:14:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
8
diff
changeset
|
65 |
| 2027 | 66 ngx_int_t ngx_http_add_location(ngx_conf_t *cf, ngx_queue_t **locations, |
| 67 ngx_http_core_loc_conf_t *clcf); | |
| 3217 | 68 ngx_int_t ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, |
|
3220
cdcd9e29c589
*) move sockaddr to the listen options
Igor Sysoev <igor@sysoev.ru>
parents:
3217
diff
changeset
|
69 ngx_http_listen_opt_t *lsopt); |
| 2027 | 70 |
| 71 | |
|
86
3973260705cc
nginx-0.0.1-2003-05-12-19:52:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
72 void ngx_http_init_connection(ngx_connection_t *c); |
|
200
abeaebe0a33c
nginx-0.0.1-2003-11-28-20:41:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
197
diff
changeset
|
73 |
| 1219 | 74 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME |
| 75 int ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg); | |
| 76 #endif | |
| 77 | |
|
432
11362a3e3911
nginx-0.0.11-2004-09-21-09:38:28 import
Igor Sysoev <igor@sysoev.ru>
parents:
416
diff
changeset
|
78 ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b); |
| 1585 | 79 ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r, |
| 80 ngx_uint_t merge_slashes); | |
| 3626 | 81 ngx_int_t ngx_http_parse_status_line(ngx_http_request_t *r, ngx_buf_t *b, |
| 82 ngx_http_status_t *status); | |
| 573 | 83 ngx_int_t ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri, |
| 84 ngx_str_t *args, ngx_uint_t *flags); | |
| 2256 | 85 ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b, |
| 86 ngx_uint_t allow_underscores); | |
| 509 | 87 ngx_int_t ngx_http_parse_multi_header_lines(ngx_array_t *headers, |
| 88 ngx_str_t *name, ngx_str_t *value); | |
| 2415 | 89 ngx_int_t ngx_http_arg(ngx_http_request_t *r, u_char *name, size_t len, |
| 90 ngx_str_t *value); | |
| 2578 | 91 void ngx_http_split_args(ngx_http_request_t *r, ngx_str_t *uri, |
| 92 ngx_str_t *args); | |
| 2415 | 93 |
|
200
abeaebe0a33c
nginx-0.0.1-2003-11-28-20:41:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
197
diff
changeset
|
94 |
|
356
2e3cbc1bbe3c
nginx-0.0.7-2004-06-16-19:32:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
346
diff
changeset
|
95 ngx_int_t ngx_http_find_server_conf(ngx_http_request_t *r); |
| 535 | 96 void ngx_http_update_location_config(ngx_http_request_t *r); |
|
88
674d333f4296
nginx-0.0.1-2003-05-14-21:13:13 import
Igor Sysoev <igor@sysoev.ru>
parents:
87
diff
changeset
|
97 void ngx_http_handler(ngx_http_request_t *r); |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
98 void ngx_http_run_posted_requests(ngx_connection_t *c); |
| 3064 | 99 ngx_int_t ngx_http_post_request(ngx_http_request_t *r, |
| 100 ngx_http_posted_request_t *pr); | |
| 509 | 101 void ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc); |
|
87
5f6d848dcbef
nginx-0.0.1-2003-05-13-20:02:32 import
Igor Sysoev <igor@sysoev.ru>
parents:
86
diff
changeset
|
102 |
|
191
71ce40b3c37b
nginx-0.0.1-2003-11-19-19:26:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
190
diff
changeset
|
103 void ngx_http_empty_handler(ngx_event_t *wev); |
| 509 | 104 void ngx_http_request_empty_handler(ngx_http_request_t *r); |
|
87
5f6d848dcbef
nginx-0.0.1-2003-05-13-20:02:32 import
Igor Sysoev <igor@sysoev.ru>
parents:
86
diff
changeset
|
105 |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
106 |
|
3392
d2a4c6aa9b9a
fix building by gcc 4.x with -O2/3/s in some Linux distributions:
Igor Sysoev <igor@sysoev.ru>
parents:
3372
diff
changeset
|
107 #define ngx_http_ephemeral(r) (void *) (&r->uri_start) |
| 3064 | 108 |
| 109 | |
| 581 | 110 #define NGX_HTTP_LAST 1 |
| 111 #define NGX_HTTP_FLUSH 2 | |
| 112 | |
| 113 ngx_int_t ngx_http_send_special(ngx_http_request_t *r, ngx_uint_t flags); | |
| 114 | |
|
59
e8cdc2989cee
nginx-0.0.1-2003-02-06-20:21:13 import
Igor Sysoev <igor@sysoev.ru>
parents:
58
diff
changeset
|
115 |
| 479 | 116 ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r, |
| 499 | 117 ngx_http_client_body_handler_pt post_handler); |
|
83
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
82
diff
changeset
|
118 |
|
356
2e3cbc1bbe3c
nginx-0.0.7-2004-06-16-19:32:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
346
diff
changeset
|
119 ngx_int_t ngx_http_send_header(ngx_http_request_t *r); |
| 499 | 120 ngx_int_t ngx_http_special_response_handler(ngx_http_request_t *r, |
| 121 ngx_int_t error); | |
|
2787
3daf68f2efe3
ngx_http_filter_finalize_request() and ngx_http_clean_header()
Igor Sysoev <igor@sysoev.ru>
parents:
2592
diff
changeset
|
122 ngx_int_t ngx_http_filter_finalize_request(ngx_http_request_t *r, |
|
2821
26e06e009ced
allow to pass image filter errors via the same location where the filter is set
Igor Sysoev <igor@sysoev.ru>
parents:
2787
diff
changeset
|
123 ngx_module_t *m, ngx_int_t error); |
|
2787
3daf68f2efe3
ngx_http_filter_finalize_request() and ngx_http_clean_header()
Igor Sysoev <igor@sysoev.ru>
parents:
2592
diff
changeset
|
124 void ngx_http_clean_header(ngx_http_request_t *r); |
|
59
e8cdc2989cee
nginx-0.0.1-2003-02-06-20:21:13 import
Igor Sysoev <igor@sysoev.ru>
parents:
58
diff
changeset
|
125 |
|
e8cdc2989cee
nginx-0.0.1-2003-02-06-20:21:13 import
Igor Sysoev <igor@sysoev.ru>
parents:
58
diff
changeset
|
126 |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
287
diff
changeset
|
127 time_t ngx_http_parse_time(u_char *value, size_t len); |
|
59
e8cdc2989cee
nginx-0.0.1-2003-02-06-20:21:13 import
Igor Sysoev <igor@sysoev.ru>
parents:
58
diff
changeset
|
128 size_t ngx_http_get_time(char *buf, time_t t); |
|
164
84036764e215
nginx-0.0.1-2003-10-29-11:30:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
160
diff
changeset
|
129 |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
130 |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
131 |
|
1370
cc114c85be0f
rename ngx_http_discard_body() to ngx_http_discard_request_body()
Igor Sysoev <igor@sysoev.ru>
parents:
1368
diff
changeset
|
132 ngx_int_t ngx_http_discard_request_body(ngx_http_request_t *r); |
|
3214
798a7f1d3b2f
restore discard body handler after ngx_http_set_writer() set it to
Igor Sysoev <igor@sysoev.ru>
parents:
3064
diff
changeset
|
133 void ngx_http_discarded_request_body_handler(ngx_http_request_t *r); |
|
1368
202cae9a0c2b
rename ngx_http_block_read() and ngx_http_test_read() to ..._reading()
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
134 void ngx_http_block_reading(ngx_http_request_t *r); |
| 2294 | 135 void ngx_http_test_reading(ngx_http_request_t *r); |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
24
diff
changeset
|
136 |
|
58
6b13b1cadabe
nginx-0.0.1-2003-01-30-21:21:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
56
diff
changeset
|
137 |
| 2138 | 138 char *ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
|
3372
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
139 char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t **keys, |
|
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
140 ngx_hash_t *types_hash, ngx_array_t **prev_keys, |
|
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3220
diff
changeset
|
141 ngx_hash_t *prev_types_hash, ngx_str_t *default_types); |
|
2175
a69886fc2864
*) fix segfaults in types hash
Igor Sysoev <igor@sysoev.ru>
parents:
2166
diff
changeset
|
142 ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, |
| 2138 | 143 ngx_str_t *default_type); |
| 144 | |
| 3772 | 145 #if (NGX_HTTP_DEGRADATION) |
| 146 ngx_uint_t ngx_http_degraded(ngx_http_request_t *); | |
| 147 #endif | |
| 148 | |
| 2138 | 149 |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
89
diff
changeset
|
150 extern ngx_module_t ngx_http_module; |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
43
diff
changeset
|
151 |
|
2166
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2138
diff
changeset
|
152 extern ngx_str_t ngx_http_html_default_types[]; |
|
723df5089c05
use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents:
2138
diff
changeset
|
153 |
|
10
4f3879d9b6f6
nginx-0.0.1-2002-09-11-19:18:33 import
Igor Sysoev <igor@sysoev.ru>
parents:
9
diff
changeset
|
154 |
|
356
2e3cbc1bbe3c
nginx-0.0.7-2004-06-16-19:32:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
346
diff
changeset
|
155 extern ngx_http_output_header_filter_pt ngx_http_top_header_filter; |
|
2e3cbc1bbe3c
nginx-0.0.7-2004-06-16-19:32:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
346
diff
changeset
|
156 extern ngx_http_output_body_filter_pt ngx_http_top_body_filter; |
|
2e3cbc1bbe3c
nginx-0.0.7-2004-06-16-19:32:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
346
diff
changeset
|
157 |
|
44
0e81ac0bb3e2
nginx-0.0.1-2003-01-09-08:36:00 import
Igor Sysoev <igor@sysoev.ru>
parents:
43
diff
changeset
|
158 |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
159 #endif /* _NGX_HTTP_H_INCLUDED_ */ |