~ubuntu-branches/debian/squeeze/nginx/squeeze

« back to all changes in this revision

Viewing changes to src/http/modules/ngx_http_limit_zone_module.c

Committer: Bazaar Package Importer
Author(s): Fabio Tranchitella
Date: 2009-11-08 09:53:46 UTC
mfrom: (1.1.13 upstream)
Revision ID: james.westby@ubuntu.com-20091108095346-yt4eypw2l176tl53

Tags: 0.7.63-1

New upstream release.

files added:
auto/lib/geoip

auto/lib/geoip/conf

src/http/modules/ngx_http_geoip_module.c

files modified:
CHANGES

CHANGES.ru

auto/lib/conf

auto/modules

auto/options

auto/sources

debian/changelog

src/core/nginx.c

src/core/nginx.h

src/core/ngx_cycle.c

src/core/ngx_file.c

src/core/ngx_file.h

src/core/ngx_hash.c

src/core/ngx_output_chain.c

src/core/ngx_string.c

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_eventport_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_rtsig_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/http/modules/ngx_http_access_module.c

src/http/modules/ngx_http_addition_filter_module.c

src/http/modules/ngx_http_auth_basic_module.c

src/http/modules/ngx_http_autoindex_module.c

src/http/modules/ngx_http_browser_module.c

src/http/modules/ngx_http_charset_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_geo_module.c

src/http/modules/ngx_http_gzip_filter_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_limit_req_module.c

src/http/modules/ngx_http_limit_zone_module.c

src/http/modules/ngx_http_log_module.c

src/http/modules/ngx_http_map_module.c

src/http/modules/ngx_http_memcached_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_realip_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_secure_link_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_ssl_module.h

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/ngx_http_xslt_filter_module.c

src/http/modules/perl/nginx.pm

src/http/modules/perl/ngx_http_perl_module.c

src/http/ngx_http_cache.h

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_file_cache.c

src/http/ngx_http_parse.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_script.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_write_filter_module.c

src/mail/ngx_mail_auth_http_module.c

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_ssl_module.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.h

src/os/unix/ngx_process.c

src/os/unix/ngx_process.h

src/os/unix/ngx_process_cycle.c

src/os/unix/ngx_process_cycle.h

Show diffs side-by-side

added added

removed removed

src/http/modules/ngx_http_limit_zone_module.c

typedef struct {

ngx_shm_zone_t *shm_zone;

ngx_uint_t conn;

ngx_uint_t log_level;

} ngx_http_limit_zone_conf_t;

static ngx_int_t ngx_http_limit_zone_init(ngx_conf_t *cf);

static ngx_conf_enum_t ngx_http_limit_conn_log_levels[] = {

{ ngx_string("info"), NGX_LOG_INFO },

{ ngx_string("notice"), NGX_LOG_NOTICE },

{ ngx_string("warn"), NGX_LOG_WARN },

{ ngx_string("error"), NGX_LOG_ERR },

{ ngx_null_string, 0 }

};

static ngx_command_t ngx_http_limit_zone_commands[] = {

{ ngx_string("limit_zone"),

NULL },

{ ngx_string("limit_conn_log_level"),

NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,

ngx_conf_set_enum_slot,

NGX_HTTP_LOC_CONF_OFFSET,

offsetof(ngx_http_limit_zone_conf_t, log_level),

&ngx_http_limit_conn_log_levels },

ngx_null_command

};

189

206

190

207

ngx_shmtx_unlock(&shpool->mutex);

191

208

192

ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,

209

ngx_log_error(lzcf->log_level, r->connection->log, 0,

193

210

"limiting connections by zone \"%V\"",

194

211

&lzcf->shm_zone->shm.name);

195

212

381

398

382

399

conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_limit_zone_conf_t));

383

400

if (conf == NULL) {

384

return NGX_CONF_ERROR;

401

return NULL;

385

402

}

386

403

387

404

391

408

* conf->conn = 0;

392

409

393

410

411

conf->log_level = NGX_CONF_UNSET_UINT;

412

394

413

return conf;

395

414

}

396

415

405

424

*conf = *prev;

406

425

}

407

426

427

ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR);

428

408

429

return NGX_CONF_OK;

409

430

}

410

431

Older »