comparison src/http/ngx_http.h @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents c5122335e41d
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
49 ngx_http_request_t *request; 49 ngx_http_request_t *request;
50 ngx_http_request_t *current_request; 50 ngx_http_request_t *current_request;
51 }; 51 };
52 52
53 53
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
54 #define ngx_http_get_module_ctx(r, module) (r)->ctx[module.ctx_index] 62 #define ngx_http_get_module_ctx(r, module) (r)->ctx[module.ctx_index]
55 #define ngx_http_set_ctx(r, c, module) r->ctx[module.ctx_index] = c; 63 #define ngx_http_set_ctx(r, c, module) r->ctx[module.ctx_index] = c;
56 64
57 65
58 ngx_int_t ngx_http_add_location(ngx_conf_t *cf, ngx_queue_t **locations, 66 ngx_int_t ngx_http_add_location(ngx_conf_t *cf, ngx_queue_t **locations,
59 ngx_http_core_loc_conf_t *clcf); 67 ngx_http_core_loc_conf_t *clcf);
68 ngx_int_t ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
69 ngx_http_listen_opt_t *lsopt);
60 70
61 71
62 void ngx_http_init_connection(ngx_connection_t *c); 72 void ngx_http_init_connection(ngx_connection_t *c);
63 73
64 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME 74 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
66 #endif 76 #endif
67 77
68 ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b); 78 ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b);
69 ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r, 79 ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r,
70 ngx_uint_t merge_slashes); 80 ngx_uint_t merge_slashes);
81 ngx_int_t ngx_http_parse_status_line(ngx_http_request_t *r, ngx_buf_t *b,
82 ngx_http_status_t *status);
71 ngx_int_t ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri, 83 ngx_int_t ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri,
72 ngx_str_t *args, ngx_uint_t *flags); 84 ngx_str_t *args, ngx_uint_t *flags);
73 ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b, 85 ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
74 ngx_uint_t allow_underscores); 86 ngx_uint_t allow_underscores);
75 ngx_int_t ngx_http_parse_multi_header_lines(ngx_array_t *headers, 87 ngx_int_t ngx_http_parse_multi_header_lines(ngx_array_t *headers,
90 102
91 void ngx_http_empty_handler(ngx_event_t *wev); 103 void ngx_http_empty_handler(ngx_event_t *wev);
92 void ngx_http_request_empty_handler(ngx_http_request_t *r); 104 void ngx_http_request_empty_handler(ngx_http_request_t *r);
93 105
94 106
95 #define ngx_http_ephemeral(r) (ngx_http_ephemeral_t *) (&r->uri_start) 107 #define ngx_http_ephemeral(r) (void *) (&r->uri_start)
96 108
97 109
98 #define NGX_HTTP_LAST 1 110 #define NGX_HTTP_LAST 1
99 #define NGX_HTTP_FLUSH 2 111 #define NGX_HTTP_FLUSH 2
100 112
116 size_t ngx_http_get_time(char *buf, time_t t); 128 size_t ngx_http_get_time(char *buf, time_t t);
117 129
118 130
119 131
120 ngx_int_t ngx_http_discard_request_body(ngx_http_request_t *r); 132 ngx_int_t ngx_http_discard_request_body(ngx_http_request_t *r);
133 void ngx_http_discarded_request_body_handler(ngx_http_request_t *r);
121 void ngx_http_block_reading(ngx_http_request_t *r); 134 void ngx_http_block_reading(ngx_http_request_t *r);
122 void ngx_http_test_reading(ngx_http_request_t *r); 135 void ngx_http_test_reading(ngx_http_request_t *r);
123 136
124 137
125 char *ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 138 char *ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
126 char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t *keys, 139 char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t **keys,
127 ngx_hash_t *types_hash, ngx_array_t *prev_keys, ngx_hash_t *prev_types_hash, 140 ngx_hash_t *types_hash, ngx_array_t **prev_keys,
128 ngx_str_t *default_types); 141 ngx_hash_t *prev_types_hash, ngx_str_t *default_types);
129 ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, 142 ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types,
130 ngx_str_t *default_type); 143 ngx_str_t *default_type);
144
145 #if (NGX_HTTP_DEGRADATION)
146 ngx_uint_t ngx_http_degraded(ngx_http_request_t *);
147 #endif
131 148
132 149
133 extern ngx_module_t ngx_http_module; 150 extern ngx_module_t ngx_http_module;
134 151
135 extern ngx_str_t ngx_http_html_default_types[]; 152 extern ngx_str_t ngx_http_html_default_types[];