comparison src/http/modules/ngx_http_geo_module.c @ 684:660139fd80ca NGINX_1_3_5

nginx 1.3.5 *) Change: the ngx_http_mp4_module module no longer skips tracks in formats other than H.264 and AAC. *) Bugfix: a segmentation fault might occur in a worker process if the "map" directive was used with variables as values. *) Bugfix: a segmentation fault might occur in a worker process if the "geo" directive was used with the "ranges" parameter but without the "default" parameter; the bug had appeared in 0.8.43. Thanks to Zhen Chen and Weibin Yao. *) Bugfix: in the -p command-line parameter handling. *) Bugfix: in the mail proxy server. *) Bugfix: of minor potential bugs. Thanks to Coverity. *) Bugfix: nginx/Windows could not be built with Visual Studio 2005 Express. Thanks to HAYASHI Kentaro.
author Igor Sysoev <http://sysoev.ru>
date Tue, 21 Aug 2012 00:00:00 +0400
parents 981b4c44593b
children 2e8a942c8872
comparison
equal deleted inserted replaced
683:28cc2a208803 684:660139fd80ca
398 { 398 {
399 ngx_http_geo_create_binary_base(&ctx); 399 ngx_http_geo_create_binary_base(&ctx);
400 } 400 }
401 } 401 }
402 402
403 if (ctx.high.default_value == NULL) {
404 ctx.high.default_value = &ngx_http_variable_null_value;
405 }
406
403 geo->u.high = ctx.high; 407 geo->u.high = ctx.high;
404 408
405 var->get_handler = ngx_http_geo_range_variable; 409 var->get_handler = ngx_http_geo_range_variable;
406 var->data = (uintptr_t) geo; 410 var->data = (uintptr_t) geo;
407
408 if (ctx.high.default_value == NULL) {
409 ctx.high.default_value = &ngx_http_variable_null_value;
410 }
411 411
412 ngx_destroy_pool(ctx.temp_pool); 412 ngx_destroy_pool(ctx.temp_pool);
413 ngx_destroy_pool(pool); 413 ngx_destroy_pool(pool);
414 414
415 } else { 415 } else {