Commit Graph

157 Commits

Author SHA1 Message Date
Igor Sysoev
acb43232f6 fix r3225: it overrode the listen options by default server default options 2009-10-22 08:14:02 +00:00
Igor Sysoev
5a95080cb6 allow to set listen options in any server 2009-10-21 19:16:38 +00:00
Igor Sysoev
ba3083bfce add listen address in error message 2009-10-21 19:13:27 +00:00
Igor Sysoev
cd8b43cde7 rename core_srv_conf fields to more understandable default_server and server 2009-10-21 16:52:10 +00:00
Igor Sysoev
f2694cb925 *) move sockaddr to the listen options
*) rename ngx_http_listen_t to ngx_http_listen_opt_t
2009-10-21 16:47:44 +00:00
Igor Sysoev
2a634f5342 fix r3218:
Initially building lists of ports, addresses, and server names had been
placed at final configuration stage, because complete set of the "listen"s
and the "server_names" were required for this operation. r3218 broke it,
because the "listen"s go usually first in configuration, and
cscf->server_names is empty at this stage, therefore no virtual names
were configured.

Now server configurations are stored in array for each address:port
to configure virtual names. Also regex captures flag is moved from
server names to core server configuration.
2009-10-21 16:27:48 +00:00
Igor Sysoev
d2d0931ed5 refactor http listen code: remove duplicate options fields 2009-10-21 08:48:04 +00:00
Igor Sysoev
79d630ac11 refactor http listen code:
*) add listen's to the global cmcf->ports array instead of server's one
*) rename ngx_http_listen_conf_t to ngx_http_listen_opt_t
2009-10-21 08:19:46 +00:00
Igor Sysoev
96e36ef252 If .domain.com, .sub.domain.com, and .domain-some.com were defined,
then .sub.domain.com was matched by .domain.com: wildcard names hash
was built incorrectly due to sorting order issue of "." vs "-".
They were sorted as
    com.domain  com.domain-some  com.domain.sub
while they should be sorted as
    com.domain  com.domain.sub   com.domain-some
for correct hash building
2009-09-12 09:28:37 +00:00
Igor Sysoev
1daaa008fb update comments missed in r2513 2009-05-17 20:13:29 +00:00
Igor Sysoev
fdf8e1e183 update variable name missed in r2513 2009-05-17 19:58:37 +00:00
Igor Sysoev
ee4be0345f ngx_create_listening() 2009-05-05 17:33:26 +00:00
Igor Sysoev
0cd76ea290 *) refactor error_log processing: listen socket log might inherit built-in
error_log with zero level, and r2447, r2466, r2467 were not enough
*) remove bogus "stderr" level
*) some functions and fields renames
2009-04-30 13:53:42 +00:00
Igor Sysoev
e46943965d backout r2535: virtual names is a property of address:port pair,
but is not a property of server configuration
2009-04-09 13:56:16 +00:00
Igor Sysoev
b37316d7dd style fix 2009-04-08 19:51:30 +00:00
Igor Sysoev
7b5edd8ffe always run regex in server_name to get captures 2009-03-19 16:07:40 +00:00
Igor Sysoev
fb3be73a38 test wildcard tail hash existance 2009-03-19 15:46:27 +00:00
Igor Sysoev
6d94b51f0b ipv6only 2009-03-13 14:20:34 +00:00
Igor Sysoev
fed1ca0dc7 move r->virtual_names to ngx_http_core_srv_conf_t 2009-02-24 07:56:47 +00:00
Igor Sysoev
1966aedd6d axe r->port_text 2009-02-24 07:29:55 +00:00
Igor Sysoev
4da223c8b5 axe unneeded port field 2009-02-23 21:30:31 +00:00
Igor Sysoev
a35eaccdec a prelimiary IPv6 support, HTTP listen 2009-02-21 07:02:02 +00:00
Igor Sysoev
a883361c47 split ports, addresses, and server names preparation and optimization 2009-02-18 16:17:12 +00:00
Igor Sysoev
d8e3d0b5a5 try_files 2008-12-15 10:56:48 +00:00
Igor Sysoev
5d4e80b8fb remove unused #include's 2008-09-05 15:25:47 +00:00
Igor Sysoev
f100c7816d *) listen ssl
*) no default ssl_cetificate and ssl_cetificate_key
2008-09-01 14:19:01 +00:00
Igor Sysoev
0c16f73b4e style fix: remove tabs and trailing spaces 2008-09-01 14:05:20 +00:00
Igor Sysoev
d76eb9a8c8 set listen configuration to default server,
this fixes the case, when default server is not the first one
2008-08-29 13:43:38 +00:00
Igor Sysoev
e04b4204a8 remove unused debug log 2008-08-27 13:26:35 +00:00
Igor Sysoev
c71e3d8f81 *) fix segfaults in types hash
*) fix inheritance: default hash instead of inherited one
2008-08-13 16:25:48 +00:00
Igor Sysoev
390abe0772 use hash in gzip_types, ssi_types, and sub_filter_types 2008-08-12 13:11:36 +00:00
Igor Sysoev
b5bc3f989f test Content-Type via hash:
*) ngx_http_test_content_type()
*) ngx_http_types_slot()
*) ngx_http_merge_types()
2008-08-04 11:29:09 +00:00
Igor Sysoev
777b019c73 ngx_strlow() 2008-08-04 10:07:00 +00:00
Igor Sysoev
7f6b2ffc60 *) back out r2040
*) refactor ngx_palloc()
*) introduce ngx_pnalloc()
*) additional pool blocks have smaller header
2008-06-17 15:00:30 +00:00
Igor Sysoev
a3a792b1ee fix building without PCRE introduced in r2023 2008-06-07 12:08:38 +00:00
Igor Sysoev
2d951bfa41 *) add ngx_palloc_aligned() to allocate explicitlty aligned memory
*) allows non-aligned memory blocks for small allocations and for odd
   length strings on all platforms
*) use ngx_palloc_aligned()
2008-05-27 09:37:40 +00:00
Igor Sysoev
5cdb2ce66e *) remove optimize_host_names
*) deprecate optimize_server_names: it is not needed since
   server_name_in_redirect introduction
2008-05-24 15:43:48 +00:00
Igor Sysoev
e55988c069 locations tree 2008-05-24 14:14:13 +00:00
Igor Sysoev
89e0aad840 delete useless lines 2008-05-22 14:28:25 +00:00
Igor Sysoev
61e991c70a axe never used variables 2008-05-22 11:11:16 +00:00
Igor Sysoev
6d14e65056 split ngx_http_block() further 2008-05-22 11:07:08 +00:00
Igor Sysoev
87ac67fbd1 split ngx_http_block() 2008-05-22 09:57:47 +00:00
Igor Sysoev
f3be0b33c2 delete outdated debug logging that only causes segfault if enabled 2008-05-22 07:10:36 +00:00
Igor Sysoev
de8ec1efc8 use ngx_int_t in ngx_sort() callback 2008-03-24 13:04:02 +00:00
Igor Sysoev
5461caf920 fix r1490 2008-03-03 16:44:56 +00:00
Igor Sysoev
86ef6aaa6b move condition declarations inside blocks where they are used 2007-12-10 12:09:51 +00:00
Igor Sysoev
4b96baa417 u_char* is enough to keep file name 2007-09-15 17:11:06 +00:00
Igor Sysoev
43c3bf42db regex in server_name 2007-08-12 19:48:12 +00:00
Igor Sysoev
242d1de5d0 style fix 2007-08-12 09:00:56 +00:00
Igor Sysoev
8889b65711 named location 2007-07-29 18:11:39 +00:00