← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/event/modules/ngx_epoll_module.c

Committer: Bazaar Package Importer
Author(s): Fabio Tranchitella
Date: 2009-05-31 18:38:56 UTC
mfrom: (1.1.10 upstream) (4.1.12 experimental)
Revision ID: james.westby@ubuntu.com-20090531183856-3xhvf6wd0bw5556i

Tags: 0.7.59-1

http://bugs.debian.org/515904

http://bugs.debian.org/507913

http://bugs.debian.org/509390

http://bugs.debian.org/524785

* New upstream release, first in Debian for the 0.7 branch. Among other
  issues, it also fixes the problem with wildcard dns names used with SSL.
  (Closes: #515904)
* debian/watch: updated.
* debian/postinst: fixed a bashism. (Closes: #507913)
* debian/conf/nginx.conf: removed default_type. (Closes: #509390)
* debian/control: updated Standards-Version to 3.8.1, no changes needed.
* debian/NEWS.Debian: documented the issues with
  server_names_hash_bucket_size. (Closes: #524785)

files added:
auto/lib/libgd

auto/lib/libgd/conf

auto/lib/libxslt

auto/lib/libxslt/conf

auto/lib/openssl/makefile.bcc

auto/lib/openssl/makefile.msvc

auto/os/darwin

src/core/ngx_queue.c

src/event/modules/ngx_win32_select_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_limit_req_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_secure_link_module.c

src/http/modules/ngx_http_xslt_filter_module.c

src/misc/ngx_cpp_test_module.cpp

src/os/unix/ngx_darwin.h

src/os/unix/ngx_darwin_config.h

src/os/unix/ngx_darwin_init.c

src/os/unix/ngx_darwin_sendfile_chain.c

files removed:
auto/lib/pcre/patch.config.in

auto/lib/pcre/patch.pcre.c

auto/lib/pcre/patch.pcre.in

auto/lib/pcre/patch.pcre.in.owc

src/core/ngx_garbage_collector.c

src/core/ngx_garbage_collector.h

src/http/ngx_http_cache.c

src/os/unix/ngx_sunpro_x86.map

src/os/unix/ngx_types.h

files modified:
CHANGES

CHANGES.ru

LICENSE

auto/cc/bcc

auto/cc/gcc

auto/cc/msvc

auto/cc/owc

auto/cc/sunc

auto/feature

auto/headers

auto/include

auto/init

auto/install

auto/lib/conf

auto/lib/md5/conf

auto/lib/md5/make

auto/lib/md5/makefile.bcc

auto/lib/md5/makefile.msvc

auto/lib/md5/makefile.owc

auto/lib/openssl/conf

auto/lib/openssl/make

auto/lib/pcre/conf

auto/lib/pcre/make

auto/lib/pcre/makefile.bcc

auto/lib/pcre/makefile.msvc

auto/lib/pcre/makefile.owc

auto/lib/sha1/make

auto/lib/sha1/makefile.bcc

auto/lib/sha1/makefile.msvc

auto/lib/sha1/makefile.owc

auto/lib/zlib/make

auto/lib/zlib/makefile.bcc

auto/lib/zlib/makefile.msvc

auto/lib/zlib/makefile.owc

auto/make

auto/modules

auto/options

auto/os/conf

auto/os/features

auto/os/linux

auto/os/solaris

auto/os/win32

auto/sources

auto/stubs

auto/unix

conf/mime.types

conf/nginx.conf

configure

debian/NEWS.Debian

debian/changelog

debian/conf/nginx.conf

debian/conf/sites-available/default

debian/control

debian/dirs

debian/init.d

debian/nginx.install

debian/postinst

debian/rules

debian/watch

src/core/nginx.c

src/core/nginx.h

src/core/ngx_array.c

src/core/ngx_buf.c

src/core/ngx_buf.h

src/core/ngx_conf_file.c

src/core/ngx_conf_file.h

src/core/ngx_config.h

src/core/ngx_connection.c

src/core/ngx_connection.h

src/core/ngx_core.h

src/core/ngx_cpuinfo.c

src/core/ngx_cycle.c

src/core/ngx_cycle.h

src/core/ngx_file.c

src/core/ngx_file.h

src/core/ngx_hash.c

src/core/ngx_hash.h

src/core/ngx_inet.c

src/core/ngx_inet.h

src/core/ngx_log.c

src/core/ngx_log.h

src/core/ngx_open_file_cache.c

src/core/ngx_open_file_cache.h

src/core/ngx_output_chain.c

src/core/ngx_palloc.c

src/core/ngx_palloc.h

src/core/ngx_queue.h

src/core/ngx_radix_tree.c

src/core/ngx_resolver.c

src/core/ngx_shmtx.h

src/core/ngx_slab.c

src/core/ngx_slab.h

src/core/ngx_string.c

src/core/ngx_string.h

src/core/ngx_times.c

src/event/modules/ngx_aio_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_select_module.c

src/event/ngx_event.c

src/event/ngx_event_accept.c

src/event/ngx_event_connect.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/event/ngx_event_pipe.c

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_chunked_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_empty_gif_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_flv_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_index_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_not_modified_filter_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_range_filter_module.c

src/http/modules/ngx_http_realip_module.c

src/http/modules/ngx_http_rewrite_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_static_module.c

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_upstream_ip_hash_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/perl/nginx.pm

src/http/modules/perl/nginx.xs

src/http/modules/perl/ngx_http_perl_module.c

src/http/ngx_http.c

src/http/ngx_http.h

src/http/ngx_http_cache.h

src/http/ngx_http_config.h

src/http/ngx_http_copy_filter_module.c

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_header_filter_module.c

src/http/ngx_http_parse.c

src/http/ngx_http_parse_time.c

src/http/ngx_http_postpone_filter_module.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_request_body.c

src/http/ngx_http_script.c

src/http/ngx_http_script.h

src/http/ngx_http_special_response.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_upstream_round_robin.c

src/http/ngx_http_variables.c

src/http/ngx_http_variables.h

src/http/ngx_http_write_filter_module.c

src/mail/ngx_mail.c

src/mail/ngx_mail.h

src/mail/ngx_mail_auth_http_module.c

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_handler.c

src/mail/ngx_mail_imap_handler.c

src/mail/ngx_mail_imap_module.c

src/mail/ngx_mail_parse.c

src/mail/ngx_mail_pop3_handler.c

src/mail/ngx_mail_pop3_module.c

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_smtp_handler.c

src/mail/ngx_mail_smtp_module.c

src/mail/ngx_mail_ssl_module.c

src/mail/ngx_mail_ssl_module.h

src/os/unix/ngx_alloc.h

src/os/unix/ngx_atomic.h

src/os/unix/ngx_errno.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.c

src/os/unix/ngx_files.h

src/os/unix/ngx_freebsd.h

src/os/unix/ngx_freebsd_config.h

src/os/unix/ngx_freebsd_init.c

src/os/unix/ngx_linux_config.h

src/os/unix/ngx_os.h

src/os/unix/ngx_posix_config.h

src/os/unix/ngx_posix_init.c

src/os/unix/ngx_process.c

src/os/unix/ngx_process_cycle.c

src/os/unix/ngx_process_cycle.h

src/os/unix/ngx_send.c

src/os/unix/ngx_shmem.h

src/os/unix/ngx_solaris_config.h

src/os/unix/ngx_sunpro_x86.il

src/os/unix/ngx_time.c

src/os/unix/ngx_time.h

src/os/unix/ngx_user.c

Show diffs side-by-side

added added

removed removed

src/event/modules/ngx_epoll_module.c

143

143

static ngx_int_t

144

144

ngx_epoll_init(ngx_cycle_t *cycle, ngx_msec_t timer)

145

145

{

146

ngx_event_conf_t *ecf;

147

146

ngx_epoll_conf_t *epcf;

148

147

149

ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module);

150

151

148

epcf = ngx_event_get_conf(cycle->conf_ctx, ngx_epoll_module);

152

149

153

150

if (ep == -1) {

154

ep = epoll_create(ecf->connections / 2);

151

ep = epoll_create(cycle->connection_n / 2);

155

152

156

153

if (ep == -1) {

157

154

ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,

Older »