nginx-vendor-current: src/http/ngx

comparison src/http/ngx_http.c @ 538:1dcf6adad484 NGINX_0_8_21

nginx 0.8.21 *) Feature: now the "-V" switch shows TLS SNI support. *) Feature: the "listen" directive of the HTTP module supports unix domain sockets. Thanks to Hongli Lai. *) Feature: the "default_server" parameter of the "listen" directive. *) Feature: now a "default" parameter is not required to set listen socket options. *) Bugfix: nginx did not support dates in 2038 year on 32-bit platforms; *) Bugfix: socket leak; the bug had appeared in 0.8.11.

author	Igor Sysoev <http://sysoev.ru>
date	Mon, 26 Oct 2009 00:00:00 +0300
parents	0161f3197817
children	c04fa65fe604

comparison

equal deleted inserted replaced

-:3ca2e495d9de
+:1dcf6adad484
 static ngx_int_t ngx_http_init_headers_in_hash(ngx_conf_t *cf,
 ngx_http_core_main_conf_t *cmcf);
 static ngx_int_t ngx_http_init_phase_handlers(ngx_conf_t *cf,
 ngx_http_core_main_conf_t *cmcf);
-static ngx_int_t ngx_http_init_server_lists(ngx_conf_t *cf,
-ngx_array_t *servers, ngx_array_t *ports);
-static ngx_int_t ngx_http_add_ports(ngx_conf_t *cf,
-ngx_http_core_srv_conf_t *cscf, ngx_array_t *ports,
-ngx_http_listen_t *listen);
 static ngx_int_t ngx_http_add_addresses(ngx_conf_t *cf,
 ngx_http_core_srv_conf_t *cscf, ngx_http_conf_port_t *port,
-ngx_http_listen_t *listen);
+ngx_http_listen_opt_t *lsopt);
 static ngx_int_t ngx_http_add_address(ngx_conf_t *cf,
 ngx_http_core_srv_conf_t *cscf, ngx_http_conf_port_t *port,
-ngx_http_listen_t *listen);
+ngx_http_listen_opt_t *lsopt);
-static ngx_int_t ngx_http_add_names(ngx_conf_t *cf,
+static ngx_int_t ngx_http_add_server(ngx_conf_t *cf,
 ngx_http_core_srv_conf_t *cscf, ngx_http_conf_addr_t *addr);
 static char *ngx_http_merge_locations(ngx_conf_t *cf,
 ngx_queue_t *locations, void **loc_conf, ngx_http_module_t *module,
 ngx_uint_t ctx_index);
 ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
 char                        *rv;
 ngx_uint_t                   mi, m, s;
 ngx_conf_t                   pcf;
-ngx_array_t                  ports;
 ngx_http_module_t           *module;
 ngx_http_conf_ctx_t         *ctx;
 ngx_http_core_loc_conf_t    *clcf;
 ngx_http_core_srv_conf_t   **cscfp;
 ngx_http_core_main_conf_t   *cmcf;
 if (ngx_http_init_phase_handlers(cf, cmcf) != NGX_OK) {
 return NGX_CONF_ERROR;
 }
-/*
-* create the lists of ports, addresses and server names
-* to find quickly the server core module configuration at run-time
-*/
-if (ngx_http_init_server_lists(cf, &cmcf->servers, &ports) != NGX_OK) {
-return NGX_CONF_ERROR;
-}
 /* optimize the lists of ports, addresses and server names */
-if (ngx_http_optimize_servers(cf, cmcf, &ports) != NGX_OK) {
+if (ngx_http_optimize_servers(cf, cmcf, cmcf->ports) != NGX_OK) {
 return NGX_CONF_ERROR;
 }
 return NGX_CONF_OK;
 return node;
 }
-static ngx_int_t
+ngx_int_t
-ngx_http_init_server_lists(ngx_conf_t *cf, ngx_array_t *servers,
+ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
-ngx_array_t *ports)
+ngx_http_listen_opt_t *lsopt)
 {
-ngx_uint_t                  s, i;
+in_port_t                   p;
-ngx_http_listen_t          *listen;
+ngx_uint_t                  i;
-ngx_http_core_srv_conf_t  **cscfp;
+struct sockaddr            *sa;
+struct sockaddr_in         *sin;
-if (ngx_array_init(ports, cf->temp_pool, 2, sizeof(ngx_http_conf_port_t))
+ngx_http_conf_port_t       *port;
-!= NGX_OK)
+ngx_http_core_main_conf_t  *cmcf;
-{
-return NGX_ERROR;
-}
-/* "server" directives */
-cscfp = servers->elts;
-for (s = 0; s < servers->nelts; s++) {
-/* "listen" directives */
-listen = cscfp[s]->listen.elts;
-for (i = 0; i < cscfp[s]->listen.nelts; i++) {
-if (ngx_http_add_ports(cf, cscfp[s], ports, &listen[i]) != NGX_OK) {
-return NGX_ERROR;
-}
-}
-}
-return NGX_OK;
-}
-static ngx_int_t
-ngx_http_add_ports(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
-ngx_array_t *ports, ngx_http_listen_t *listen)
-{
-in_port_t                 p;
-ngx_uint_t                i;
-struct sockaddr          *sa;
-struct sockaddr_in       *sin;
-ngx_http_conf_port_t     *port;
 #if (NGX_HAVE_INET6)
-struct sockaddr_in6      *sin6;
+struct sockaddr_in6        *sin6;
 #endif
-sa = (struct sockaddr *) &listen->sockaddr;
+cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+if (cmcf->ports == NULL) {
+cmcf->ports = ngx_array_create(cf->temp_pool, 2,
+sizeof(ngx_http_conf_port_t));
+if (cmcf->ports == NULL) {
+return NGX_ERROR;
+}
+}
+sa = (struct sockaddr *) &lsopt->sockaddr;
 switch (sa->sa_family) {
 #if (NGX_HAVE_INET6)
 case AF_INET6:
 sin6 = (struct sockaddr_in6 *) sa;
 p = sin6->sin6_port;
 break;
 #endif
+#if (NGX_HAVE_UNIX_DOMAIN)
+case AF_UNIX:
+p = 0;
+break;
+#endif
 default: /* AF_INET */
 sin = (struct sockaddr_in *) sa;
 p = sin->sin_port;
 break;
 }
-port = ports->elts;
+port = cmcf->ports->elts;
-for (i = 0; i < ports->nelts; i++) {
+for (i = 0; i < cmcf->ports->nelts; i++) {
 if (p != port[i].port || sa->sa_family != port[i].family) {
 continue;
 }
 /* a port is already in the port list */
-return ngx_http_add_addresses(cf, cscf, &port[i], listen);
+return ngx_http_add_addresses(cf, cscf, &port[i], lsopt);
 }
 /* add a port to the port list */
-port = ngx_array_push(ports);
+port = ngx_array_push(cmcf->ports);
 if (port == NULL) {
 return NGX_ERROR;
 }
 port->family = sa->sa_family;
 port->port = p;
 port->addrs.elts = NULL;
-return ngx_http_add_address(cf, cscf, port, listen);
+return ngx_http_add_address(cf, cscf, port, lsopt);
 }
 static ngx_int_t
 ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
-ngx_http_conf_port_t *port, ngx_http_listen_t *listen)
+ngx_http_conf_port_t *port, ngx_http_listen_opt_t *lsopt)
 {
 u_char                *p;
 size_t                 len, off;
-ngx_uint_t             i;
+ngx_uint_t             i, default_server;
 struct sockaddr       *sa;
 ngx_http_conf_addr_t  *addr;
+#if (NGX_HAVE_UNIX_DOMAIN)
+struct sockaddr_un    *saun;
+#endif
 /*
 * we can not compare whole sockaddr struct's as kernel
 * may fill some fields in inherited sockaddr struct's
 */
-sa = (struct sockaddr *) &listen->sockaddr;
+sa = (struct sockaddr *) &lsopt->sockaddr;
 switch (sa->sa_family) {
 #if (NGX_HAVE_INET6)
 case AF_INET6:
 off = offsetof(struct sockaddr_in6, sin6_addr);
 len = 16;
 break;
 #endif
+#if (NGX_HAVE_UNIX_DOMAIN)
+case AF_UNIX:
+off = offsetof(struct sockaddr_un, sun_path);
+len = sizeof(saun->sun_path);
+break;
+#endif
 default: /* AF_INET */
 off = offsetof(struct sockaddr_in, sin_addr);
 len = 4;
 break;
 }
-p = listen->sockaddr + off;
+p = lsopt->sockaddr + off;
 addr = port->addrs.elts;
 for (i = 0; i < port->addrs.nelts; i++) {
-if (ngx_memcmp(p, (u_char *) addr[i].sockaddr + off, len) != 0) {
+if (ngx_memcmp(p, (u_char *) addr[i].opt.sockaddr + off, len) != 0) {
 continue;
 }
 /* the address is already in the address list */
-if (ngx_http_add_names(cf, cscf, &addr[i]) != NGX_OK) {
+if (ngx_http_add_server(cf, cscf, &addr[i]) != NGX_OK) {
 return NGX_ERROR;
 }
+/* preserve default_server bit during listen options overwriting */
+default_server = addr[i].opt.default_server;
+if (lsopt->set) {
+if (addr[i].opt.set) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"a duplicate listen options for %s", addr[i].opt.addr);
+return NGX_ERROR;
+}
+addr[i].opt = *lsopt;
+}
 /* check the duplicate "default" server for this address:port */
-if (listen->conf.default_server) {
+if (lsopt->default_server) {
-if (addr[i].default_server) {
+if (default_server) {
-ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"the duplicate default server in %s:%ui",
+"a duplicate default server for %s", addr[i].opt.addr);
-listen->file_name, listen->line);
 return NGX_ERROR;
 }
-addr[i].core_srv_conf = cscf;
+default_server = 1;
-addr[i].default_server = 1;
+addr[i].default_server = cscf;
-#if (NGX_HTTP_SSL)
+}
-addr[i].ssl = listen->conf.ssl;
-#endif
+addr[i].opt.default_server = default_server;
-addr[i].listen_conf = &listen->conf;
-}
 return NGX_OK;
 }
 /* add the address to the addresses list that bound to this port */
-return ngx_http_add_address(cf, cscf, port, listen);
+return ngx_http_add_address(cf, cscf, port, lsopt);
 }
 /*
 * add the server address, the server names and the server core module
 * configurations to the port list
 */
 static ngx_int_t
 ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
-ngx_http_conf_port_t *port, ngx_http_listen_t *listen)
+ngx_http_conf_port_t *port, ngx_http_listen_opt_t *lsopt)
 {
 ngx_http_conf_addr_t  *addr;
 if (port->addrs.elts == NULL) {
 if (ngx_array_init(&port->addrs, cf->temp_pool, 4,
 addr = ngx_array_push(&port->addrs);
 if (addr == NULL) {
 return NGX_ERROR;
 }
-addr->sockaddr = (struct sockaddr *) &listen->sockaddr;
+addr->opt = *lsopt;
-addr->socklen = listen->socklen;
 addr->hash.buckets = NULL;
 addr->hash.size = 0;
 addr->wc_head = NULL;
 addr->wc_tail = NULL;
-addr->names.elts = NULL;
 #if (NGX_PCRE)
 addr->nregex = 0;
 addr->regex = NULL;
 #endif
-addr->core_srv_conf = cscf;
+addr->default_server = cscf;
-addr->default_server = listen->conf.default_server;
+addr->servers.elts = NULL;
-addr->bind = listen->conf.bind;
-addr->wildcard = listen->conf.wildcard;
+return ngx_http_add_server(cf, cscf, addr);
-#if (NGX_HTTP_SSL)
+}
-addr->ssl = listen->conf.ssl;
-#endif
-addr->listen_conf = &listen->conf;
+/* add the server core module configuration to the address:port */
-return ngx_http_add_names(cf, cscf, addr);
-}
-/*
-* add the server names and the server core module
-* configurations to the address:port
-*/
 static ngx_int_t
-ngx_http_add_names(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
+ngx_http_add_server(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 ngx_http_conf_addr_t *addr)
 {
-ngx_uint_t               i;
+ngx_uint_t                  i;
-ngx_http_server_name_t  *server_names, *name;
+ngx_http_core_srv_conf_t  **server;
-if (addr->names.elts == NULL) {
+if (addr->servers.elts == NULL) {
-if (ngx_array_init(&addr->names, cf->temp_pool, 4,
+if (ngx_array_init(&addr->servers, cf->temp_pool, 4,
-sizeof(ngx_http_server_name_t))
+sizeof(ngx_http_core_srv_conf_t *))
 != NGX_OK)
 {
 return NGX_ERROR;
 }
-}
+} else {
-server_names = cscf->server_names.elts;
+server = addr->servers.elts;
+for (i = 0; i < addr->servers.nelts; i++) {
-for (i = 0; i < cscf->server_names.nelts; i++) {
+if (server[i] == cscf) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-ngx_strlow(server_names[i].name.data, server_names[i].name.data,
+"a duplicate listen %s", addr->opt.addr);
-server_names[i].name.len);
+return NGX_ERROR;
+}
-ngx_log_debug1(NGX_LOG_DEBUG_HTTP, cf->log, 0,
+}
-"name: %V", &server_names[i].name);
+}
-name = ngx_array_push(&addr->names);
+server = ngx_array_push(&addr->servers);
-if (name == NULL) {
+if (server == NULL) {
 return NGX_ERROR;
 }
-*name = server_names[i];
+*server = cscf;
-}
 return NGX_OK;
 }
 static ngx_int_t
 ngx_http_optimize_servers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf,
 ngx_array_t *ports)
 {
-ngx_uint_t               s, p, a;
+ngx_uint_t               p, a;
-ngx_http_conf_port_t    *port;
+ngx_http_conf_port_t  *port;
-ngx_http_conf_addr_t    *addr;
+ngx_http_conf_addr_t  *addr;
-ngx_http_server_name_t  *name;
 port = ports->elts;
 for (p = 0; p < ports->nelts; p++) {
 ngx_sort(port[p].addrs.elts, (size_t) port[p].addrs.nelts,
 */
 addr = port[p].addrs.elts;
 for (a = 0; a < port[p].addrs.nelts; a++) {
-name = addr[a].names.elts;
+if (addr[a].servers.nelts > 1
-for (s = 0; s < addr[a].names.nelts; s++) {
-if (addr[a].core_srv_conf == name[s].core_srv_conf
 #if (NGX_PCRE)
-&& name[s].captures == 0
+|| addr[a].default_server->captures
 #endif
 )
 {
-continue;
-}
 if (ngx_http_server_names(cf, cmcf, &addr[a]) != NGX_OK) {
 return NGX_ERROR;
 }
-break;
 }
 }
 if (ngx_http_init_listening(cf, &port[p]) != NGX_OK) {
 return NGX_ERROR;
 static ngx_int_t
 ngx_http_server_names(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf,
 ngx_http_conf_addr_t *addr)
 {
-ngx_int_t                rc;
+ngx_int_t                   rc;
-ngx_uint_t               s;
+ngx_uint_t                  n, s;
-ngx_hash_init_t          hash;
+ngx_hash_init_t             hash;
-ngx_hash_keys_arrays_t   ha;
+ngx_hash_keys_arrays_t      ha;
-ngx_http_server_name_t  *name;
+ngx_http_server_name_t     *name;
+ngx_http_core_srv_conf_t  **cscfp;
 #if (NGX_PCRE)
-ngx_uint_t               regex, i;
+ngx_uint_t                  regex, i;
 regex = 0;
 #endif
 ngx_memzero(&ha, sizeof(ngx_hash_keys_arrays_t));
 if (ngx_hash_keys_array_init(&ha, NGX_HASH_LARGE) != NGX_OK) {
 goto failed;
 }
-name = addr->names.elts;
+cscfp = addr->servers.elts;
-for (s = 0; s < addr->names.nelts; s++) {
+for (s = 0; s < addr->servers.nelts; s++) {
+name = cscfp[s]->server_names.elts;
+for (n = 0; n < cscfp[s]->server_names.nelts; n++) {
 #if (NGX_PCRE)
-if (name[s].regex) {
+if (name[n].regex) {
 regex++;
 continue;
 }
 #endif
-rc = ngx_hash_add_key(&ha, &name[s].name, name[s].core_srv_conf,
+rc = ngx_hash_add_key(&ha, &name[n].name, name[n].server,
 NGX_HASH_WILDCARD_KEY);
 if (rc == NGX_ERROR) {
 return NGX_ERROR;
 }
 if (rc == NGX_DECLINED) {
 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
 "invalid server name or wildcard \"%V\" on %s",
-&name[s].name, addr->listen_conf->addr);
+&name[n].name, addr->opt.addr);
 return NGX_ERROR;
 }
 if (rc == NGX_BUSY) {
 ngx_log_error(NGX_LOG_WARN, cf->log, 0,
 "conflicting server name \"%V\" on %s, ignored",
-&name[s].name, addr->listen_conf->addr);
+&name[n].name, addr->opt.addr);
+}
 }
 }
 hash.key = ngx_hash_key_lc;
 hash.max_size = cmcf->server_names_hash_max_size;
 addr->regex = ngx_palloc(cf->pool, regex * sizeof(ngx_http_server_name_t));
 if (addr->regex == NULL) {
 return NGX_ERROR;
 }
-for (i = 0, s = 0; s < addr->names.nelts; s++) {
+i = 0;
-if (name[s].regex) {
-addr->regex[i++] = name[s];
+for (s = 0; s < addr->servers.nelts; s++) {
+name = cscfp[s]->server_names.elts;
+for (n = 0; n < cscfp[s]->server_names.nelts; n++) {
+if (name[n].regex) {
+addr->regex[i++] = name[n];
+}
 }
 }
 #endif
 ngx_http_conf_addr_t  *first, *second;
 first = (ngx_http_conf_addr_t *) one;
 second = (ngx_http_conf_addr_t *) two;
-if (first->wildcard) {
+if (first->opt.wildcard) {
 /* a wildcard address must be the last resort, shift it to the end */
 return 1;
 }
-if (first->bind && !second->bind) {
+if (first->opt.bind && !second->opt.bind) {
 /* shift explicit bind()ed addresses to the start */
 return -1;
 }
-if (!first->bind && second->bind) {
+if (!first->opt.bind && second->opt.bind) {
 /* shift explicit bind()ed addresses to the start */
 return 1;
 }
 /* do not sort by default */
 * the "*:port" only and ignore other implicit bindings.  The bindings
 * have been already sorted: explicit bindings are on the start, then
 * implicit bindings go, and wildcard binding is in the end.
 */
-if (addr[last - 1].wildcard) {
+if (addr[last - 1].opt.wildcard) {
-addr[last - 1].bind = 1;
+addr[last - 1].opt.bind = 1;
 bind_wildcard = 1;
 } else {
 bind_wildcard = 0;
 }
 i = 0;
 while (i < last) {
-if (bind_wildcard && !addr[i].bind) {
+if (bind_wildcard && !addr[i].opt.bind) {
 i++;
 continue;
 }
 ls = ngx_http_add_listening(cf, &addr[i]);
 {
 ngx_listening_t           *ls;
 ngx_http_core_loc_conf_t  *clcf;
 ngx_http_core_srv_conf_t  *cscf;
-ls = ngx_create_listening(cf, addr->sockaddr, addr->socklen);
+ls = ngx_create_listening(cf, addr->opt.sockaddr, addr->opt.socklen);
 if (ls == NULL) {
 return NULL;
 }
 ls->addr_ntop = 1;
 ls->handler = ngx_http_init_connection;
-cscf = addr->core_srv_conf;
+cscf = addr->default_server;
 ls->pool_size = cscf->connection_pool_size;
 ls->post_accept_timeout = cscf->client_header_timeout;
 clcf = cscf->ctx->loc_conf[ngx_http_core_module.ctx_index];
 ls->post_accept_buffer_size = cscf->client_header_buffer_size;
 }
 }
 #endif
-ls->backlog = addr->listen_conf->backlog;
+ls->backlog = addr->opt.backlog;
-ls->rcvbuf = addr->listen_conf->rcvbuf;
+ls->rcvbuf = addr->opt.rcvbuf;
-ls->sndbuf = addr->listen_conf->sndbuf;
+ls->sndbuf = addr->opt.sndbuf;
 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
-ls->accept_filter = addr->listen_conf->accept_filter;
+ls->accept_filter = addr->opt.accept_filter;
 #endif
 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
-ls->deferred_accept = addr->listen_conf->deferred_accept;
+ls->deferred_accept = addr->opt.deferred_accept;
 #endif
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-ls->ipv6only = addr->listen_conf->ipv6only;
+ls->ipv6only = addr->opt.ipv6only;
 #endif
 return ls;
 }
 addrs = hport->addrs;
 for (i = 0; i < hport->naddrs; i++) {
-sin = (struct sockaddr_in *) addr[i].sockaddr;
+sin = (struct sockaddr_in *) addr[i].opt.sockaddr;
 addrs[i].addr = sin->sin_addr.s_addr;
-addrs[i].conf.core_srv_conf = addr[i].core_srv_conf;
+addrs[i].conf.default_server = addr[i].default_server;
 #if (NGX_HTTP_SSL)
-addrs[i].conf.ssl = addr[i].ssl;
+addrs[i].conf.ssl = addr[i].opt.ssl;
 #endif
 if (addr[i].hash.buckets == NULL
 && (addr[i].wc_head == NULL
 || addr[i].wc_head->hash.buckets == NULL)
 addrs6 = hport->addrs;
 for (i = 0; i < hport->naddrs; i++) {
-sin6 = (struct sockaddr_in6 *) addr[i].sockaddr;
+sin6 = (struct sockaddr_in6 *) addr[i].opt.sockaddr;
 addrs6[i].addr6 = sin6->sin6_addr;
-addrs6[i].conf.core_srv_conf = addr[i].core_srv_conf;
+addrs6[i].conf.default_server = addr[i].default_server;
 #if (NGX_HTTP_SSL)
-addrs6[i].conf.ssl = addr[i].ssl;
+addrs6[i].conf.ssl = addr[i].opt.ssl;
 #endif
 if (addr[i].hash.buckets == NULL
 && (addr[i].wc_head == NULL
 || addr[i].wc_head->hash.buckets == NULL)

Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http.c @ 538:1dcf6adad484 NGINX_0_8_21