comparison src/core/ngx_conf_file.h @ 212:56688ed172c8 NGINX_0_3_53

nginx 0.3.53 *) Change: the "add_header" directive adds the string to 204, 301, and 302 responses. *) Feature: the "server" directive in the "upstream" context supports the "weight" parameter. *) Feature: the "server_name" directive supports the "*" wildcard. *) Feature: nginx supports the request body size more than 2G. *) Bugfix: if a client was successfully authorized using "satisfy_any on", then anyway the message "access forbidden by rule" was written in the log. *) Bugfix: the "PUT" method may erroneously not create a file and return the 409 code. *) Bugfix: if the IMAP/POP3 backend returned an error, then nginx continued proxying anyway.
author Igor Sysoev <http://sysoev.ru>
date Fri, 07 Jul 2006 00:00:00 +0400
parents d2ae1c9f1fd3
children f7cd062ee035
comparison
equal deleted inserted replaced
211:f04a54878110 212:56688ed172c8
234 #define ngx_conf_init_ptr_value(conf, default) \ 234 #define ngx_conf_init_ptr_value(conf, default) \
235 if (conf == NGX_CONF_UNSET_PTR) { \ 235 if (conf == NGX_CONF_UNSET_PTR) { \
236 conf = default; \ 236 conf = default; \
237 } 237 }
238 238
239 #define ngx_conf_init_unsigned_value(conf, default) \ 239 #define ngx_conf_init_uint_value(conf, default) \
240 if (conf == (unsigned) NGX_CONF_UNSET) { \ 240 if (conf == NGX_CONF_UNSET_UINT) { \
241 conf = default; \ 241 conf = default; \
242 } 242 }
243 243
244 #define ngx_conf_init_size_value(conf, default) \ 244 #define ngx_conf_init_size_value(conf, default) \
245 if (conf == NGX_CONF_UNSET_SIZE) { \ 245 if (conf == NGX_CONF_UNSET_SIZE) { \
259 #define ngx_conf_merge_ptr_value(conf, prev, default) \ 259 #define ngx_conf_merge_ptr_value(conf, prev, default) \
260 if (conf == NULL) { \ 260 if (conf == NULL) { \
261 conf = (prev == NULL) ? default : prev; \ 261 conf = (prev == NULL) ? default : prev; \
262 } 262 }
263 263
264 #define ngx_conf_merge_unsigned_value(conf, prev, default) \ 264 #define ngx_conf_merge_uint_value(conf, prev, default) \
265 if (conf == NGX_CONF_UNSET_UINT) { \ 265 if (conf == NGX_CONF_UNSET_UINT) { \
266 conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \ 266 conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \
267 } 267 }
268 268
269 #define ngx_conf_merge_msec_value(conf, prev, default) \ 269 #define ngx_conf_merge_msec_value(conf, prev, default) \
277 } 277 }
278 278
279 #define ngx_conf_merge_size_value(conf, prev, default) \ 279 #define ngx_conf_merge_size_value(conf, prev, default) \
280 if (conf == NGX_CONF_UNSET_SIZE) { \ 280 if (conf == NGX_CONF_UNSET_SIZE) { \
281 conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \ 281 conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \
282 }
283
284 #define ngx_conf_merge_off_value(conf, prev, default) \
285 if (conf == NGX_CONF_UNSET) { \
286 conf = (prev == NGX_CONF_UNSET) ? default : prev; \
282 } 287 }
283 288
284 #define ngx_conf_merge_str_value(conf, prev, default) \ 289 #define ngx_conf_merge_str_value(conf, prev, default) \
285 if (conf.data == NULL) { \ 290 if (conf.data == NULL) { \
286 if (prev.data) { \ 291 if (prev.data) { \
326 char *ngx_conf_set_str_array_slot(ngx_conf_t *cf, ngx_command_t *cmd, 331 char *ngx_conf_set_str_array_slot(ngx_conf_t *cf, ngx_command_t *cmd,
327 void *conf); 332 void *conf);
328 char *ngx_conf_set_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 333 char *ngx_conf_set_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
329 char *ngx_conf_set_num_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 334 char *ngx_conf_set_num_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
330 char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 335 char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
336 char *ngx_conf_set_off_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
331 char *ngx_conf_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 337 char *ngx_conf_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
332 char *ngx_conf_set_sec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 338 char *ngx_conf_set_sec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
333 char *ngx_conf_set_bufs_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 339 char *ngx_conf_set_bufs_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
334 char *ngx_conf_set_enum_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 340 char *ngx_conf_set_enum_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
335 char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 341 char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);