nginx-ranges: src/http/ngx_http.c comparison

comparison src/http/ngx_http.c @ 50:72eb30262aac NGINX_0_1_25

nginx 0.1.25 *) Bugfix: nginx did run on Linux parisc. *) Feature: nginx now does not start under FreeBSD if the sysctl kern.ipc.somaxconn value is too big. *) Bugfix: if a request was internally redirected by the ngx_http_index_module module to the ngx_http_proxy_module or ngx_http_fastcgi_module modules, then the index file was not closed after request completion. *) Feature: the "proxy_pass" can be used in location with regular expression. *) Feature: the ngx_http_rewrite_filter_module module supports the condition like "if ($HTTP_USER_AGENT ~ MSIE)". *) Bugfix: nginx started too slow if the large number of addresses and text values were used in the "geo" directive. *) Change: a variable name must be declared as "$name" in the "geo" directive. The previous variant without "$" is still supported, but will be removed soon. *) Feature: the "%{VARIABLE}v" logging parameter. *) Feature: the "set $name value" directive. *) Bugfix: gcc 4.0 compatibility. *) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.

author	Igor Sysoev <http://sysoev.ru>
date	Sat, 19 Mar 2005 00:00:00 +0300
parents	6cfc63e68377
children	0d75d65c642f

comparison

equal deleted inserted replaced

-:93dabbc9efb9
+:72eb30262aac
 #endif
 /* the main http context */
-if (!(ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t)))) {
+ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t));
+if (ctx == NULL) {
 return NGX_CONF_ERROR;
 }
 *(ngx_http_conf_ctx_t **) conf = ctx;
 return NGX_CONF_ERROR;
 }
 }
 if (module->create_main_conf) {
-if (!(ctx->main_conf[mi] = module->create_main_conf(cf))) {
+ctx->main_conf[mi] = module->create_main_conf(cf);
+if (ctx->main_conf[mi] == NULL) {
 return NGX_CONF_ERROR;
 }
 }
 if (module->create_srv_conf) {
-if (!(ctx->srv_conf[mi] = module->create_srv_conf(cf))) {
+ctx->srv_conf[mi] = module->create_srv_conf(cf);
+if (ctx->srv_conf[mi] == NULL) {
 return NGX_CONF_ERROR;
 }
 }
 if (module->create_loc_conf) {
-if (!(ctx->loc_conf[mi] = module->create_loc_conf(cf))) {
+ctx->loc_conf[mi] = module->create_loc_conf(cf);
+if (ctx->loc_conf[mi] == NULL) {
 return NGX_CONF_ERROR;
 }
 }
 }
 }
 }
 /* we needed http{}'s cf->ctx while the merging configuration */
 *cf = pcf;
 /* init lists of the handlers */
 if (ngx_array_init(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers,
-cf->pool, 1, sizeof(ngx_http_handler_pt)) == NGX_ERROR)
+cf->pool, 1, sizeof(ngx_http_handler_pt)) != NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 cmcf->phases[NGX_HTTP_REWRITE_PHASE].type = NGX_OK;
 /* the special find config phase for a single handler */
 if (ngx_array_init(&cmcf->phases[NGX_HTTP_FIND_CONFIG_PHASE].handlers,
-cf->pool, 1, sizeof(ngx_http_handler_pt)) == NGX_ERROR)
+cf->pool, 1, sizeof(ngx_http_handler_pt)) != NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 cmcf->phases[NGX_HTTP_FIND_CONFIG_PHASE].type = NGX_OK;
-h = ngx_push_array(&cmcf->phases[NGX_HTTP_FIND_CONFIG_PHASE].handlers);
+h = ngx_array_push(&cmcf->phases[NGX_HTTP_FIND_CONFIG_PHASE].handlers);
 if (h == NULL) {
 return NGX_CONF_ERROR;
 }
 *h = ngx_http_find_location_config;
 if (ngx_array_init(&cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers,
-cf->pool, 1, sizeof(ngx_http_handler_pt)) == NGX_ERROR)
+cf->pool, 1, sizeof(ngx_http_handler_pt)) != NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 cmcf->phases[NGX_HTTP_ACCESS_PHASE].type = NGX_DECLINED;
 if (ngx_array_init(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers,
-cf->pool, 4, sizeof(ngx_http_handler_pt)) == NGX_ERROR)
+cf->pool, 4, sizeof(ngx_http_handler_pt)) != NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 cmcf->phases[NGX_HTTP_CONTENT_PHASE].type = NGX_OK;
 * create the lists of ports, addresses and server names
 * to quickly find the server core module configuration at run-time
 */
 if (ngx_array_init(&in_ports, cf->pool, 10, sizeof(ngx_http_in_port_t))
-== NGX_ERROR)
+!= NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 /* "server" directives */
 if (lscf[l].addr == in_addr[a].addr) {
 /* the address is already in the address list */
 if (ngx_http_add_names(cf, &in_addr[a], cscfp[s])
-== NGX_ERROR)
+!= NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 /*
 } else if (in_addr[a].addr == INADDR_ANY) {
 /* the INADDR_ANY is always the last address */
-if (!(inaddr = ngx_array_push(&in_port[p].addrs))) {
+inaddr = ngx_array_push(&in_port[p].addrs);
+if (inaddr == NULL) {
 return NGX_CONF_ERROR;
 }
 /*
 * the INADDR_ANY must be the last resort
 in_addr[a].wildcards.elts = NULL;
 in_addr[a].default_server = lscf[l].default_server;
 in_addr[a].core_srv_conf = cscfp[s];
 if (ngx_http_add_names(cf, &in_addr[a], cscfp[s])
-== NGX_ERROR)
+!= NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 addr_found = 1;
 * add the address to the addresses list that
 * bound to this port
 */
 if (ngx_http_add_address(cf, &in_port[p], &lscf[l],
-cscfp[s]) == NGX_ERROR)
+cscfp[s]) != NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 }
 }
 if (!port_found) {
 /* add the port to the in_port list */
-if (!(in_port = ngx_array_push(&in_ports))) {
+in_port = ngx_array_push(&in_ports);
+if (in_port == NULL) {
 return NGX_CONF_ERROR;
 }
 in_port->port = lscf[l].port;
 in_port->addrs.elts = NULL;
-if (!(in_port->port_text.data = ngx_palloc(cf->pool, 7))) {
+in_port->port_text.data = ngx_palloc(cf->pool, 7);
+if (in_port->port_text.data == NULL) {
 return NGX_CONF_ERROR;
 }
 in_port->port_text.len = ngx_sprintf(in_port->port_text.data,
 ":%d", in_port->port)
 - in_port->port_text.data;
 if (ngx_http_add_address(cf, in_port, &lscf[l], cscfp[s])
-== NGX_ERROR)
+!= NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 }
 }
 name = in_addr[a].names.elts;
 for (n = 0; n < in_addr[a].names.nelts; n++) {
 if (in_addr[a].core_srv_conf != name[n].core_srv_conf
 || name[n].core_srv_conf->restrict_host_names
 != NGX_HTTP_RESTRICT_HOST_OFF)
 {
 virtual_names = 1;
 break;
 }
 }
 if (!virtual_names) {
 name = in_addr[a].wildcards.elts;
 for (n = 0; n < in_addr[a].wildcards.nelts; n++) {
 if (in_addr[a].core_srv_conf != name[n].core_srv_conf
 || name[n].core_srv_conf->restrict_host_names
 != NGX_HTTP_RESTRICT_HOST_OFF)
 {
 virtual_names = 1;
 break;
 }
 }
 return NGX_CONF_ERROR;
 }
 for (n = 0; n < cmcf->server_names_hash; n++) {
 if (ngx_array_init(&in_addr[a].hash[n], cf->pool, 5,
-sizeof(ngx_http_server_name_t)) == NGX_ERROR)
+sizeof(ngx_http_server_name_t)) != NGX_OK)
 {
 return NGX_CONF_ERROR;
 }
 }
 for (s = 0; s < in_addr[a].names.nelts; s++) {
 ngx_http_server_names_hash_key(key, name[s].name.data,
 name[s].name.len,
 cmcf->server_names_hash);
-if (!(s_name = ngx_array_push(&in_addr[a].hash[key]))) {
+s_name = ngx_array_push(&in_addr[a].hash[key]);
+if (s_name == NULL) {
 return NGX_CONF_ERROR;
 }
 *s_name = name[s];
 }
 if (ls == NULL) {
 return NGX_CONF_ERROR;
 }
 ls->backlog = -1;
-#if 0
-#if 0
-ls->nonblocking = 1;
-#else
-ls->nonblocking = 0;
-#endif
-#endif
 ls->addr_ntop = 1;
 ls->handler = ngx_http_init_connection;
 cscf = in_addr[a].core_srv_conf;
 /*
 * if this port has not the "*:port" binding then create
 * the separate ngx_http_in_port_t for the all bindings
 */
-ngx_test_null(inport,
+inport = ngx_palloc(cf->pool, sizeof(ngx_http_in_port_t));
-ngx_palloc(cf->pool,
+if (inport == NULL) {
-sizeof(ngx_http_in_port_t)),
+return NGX_CONF_ERROR;
-NGX_CONF_ERROR);
+}
 inport->port = in_port[p].port;
 inport->port_text = in_port[p].port_text;
 /* init list of the addresses ... */
-ngx_init_array(inport->addrs, cf->pool, 1,
+if (ngx_array_init(&inport->addrs, cf->pool, 1,
-sizeof(ngx_http_in_addr_t),
+sizeof(ngx_http_in_addr_t)) != NGX_OK)
-NGX_CONF_ERROR);
+{
+return NGX_CONF_ERROR;
+}
 /* ... and set up it with the first address */
 inport->addrs.nelts = 1;
 inport->addrs.elts = in_port[p].addrs.elts;
 ls->servers = inport;
 /* prepare for the next cycle */
 in_port[p].addrs.elts = (char *) in_port[p].addrs.elts
 + in_port[p].addrs.size;
 in_port[p].addrs.nelts--;
 in_addr = (ngx_http_in_addr_t *) in_port[p].addrs.elts;
 a = 0;
 {
 ngx_http_in_addr_t  *in_addr;
 if (in_port->addrs.elts == NULL) {
 if (ngx_array_init(&in_port->addrs, cf->pool, 10,
-sizeof(ngx_http_in_addr_t)) == NGX_ERROR)
+sizeof(ngx_http_in_addr_t)) != NGX_OK)
 {
 return NGX_ERROR;
 }
 }
-if (!(in_addr = ngx_array_push(&in_port->addrs))) {
+in_addr = ngx_array_push(&in_port->addrs);
+if (in_addr == NULL) {
 return NGX_ERROR;
 }
 in_addr->addr = lscf->addr;
 in_addr->names.elts = NULL;
 ngx_array_t             *array;
 ngx_http_server_name_t  *server_names, *name;
 if (in_addr->names.elts == NULL) {
 if (ngx_array_init(&in_addr->names, cf->pool, 10,
-sizeof(ngx_http_server_name_t)) == NGX_ERROR)
+sizeof(ngx_http_server_name_t)) != NGX_OK)
 {
 return NGX_ERROR;
 }
 }
 if (in_addr->wildcards.elts == NULL) {
 if (ngx_array_init(&in_addr->wildcards, cf->pool, 10,
-sizeof(ngx_http_server_name_t)) == NGX_ERROR)
+sizeof(ngx_http_server_name_t)) != NGX_OK)
 {
 return NGX_ERROR;
 }
 }
 } else {
 array = &in_addr->names;
 }
-if (!(name = ngx_array_push(array))) {
+name = ngx_array_push(array);
+if (name == NULL) {
 return NGX_ERROR;
 }
 *name = server_names[i];
 }

Mercurial > hg > nginx-ranges

comparison src/http/ngx_http.c @ 50:72eb30262aac NGINX_0_1_25