← Back to branch summary

~ubuntu-branches/ubuntu/natty/nginx/natty

~ubuntu-branches/ubuntu/natty/nginx/natty

« back to all changes in this revision

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

Committer: Bazaar Package Importer
Author(s): Bhavani Shankar
Date: 2010-11-28 08:38:27 UTC
mfrom: (4.2.24 sid)
Revision ID: james.westby@ubuntu.com-20101128083827-yxc30ucpllbu3h08

Tags: 0.8.53-1ubuntu1

https://launchpad.net/bugs/547267

https://launchpad.net/bugs/674224

* Merge from debian unstable. Remaining changes:
  - Don't copy the default site directly into /var/www/ in the package,
    but instead keep it in /usr/share/nginx/nginx-default and move it to
   /var/www/nginx-default/ just after installation. (LP: #547267)
* debian/patches/nginx-html5-codecs.diff
  - Add support for html5 codecs (LP: #674224)

files added:
.pc/nginx-echo.diff

.pc/nginx-echo.diff/modules

.pc/nginx-echo.diff/modules/nginx-echo

.pc/nginx-echo.diff/modules/nginx-echo/LICENSE

.pc/nginx-echo.diff/modules/nginx-echo/README

.pc/nginx-echo.diff/modules/nginx-echo/config

.pc/nginx-echo.diff/modules/nginx-echo/doc

.pc/nginx-echo.diff/modules/nginx-echo/doc/manpage.wiki

.pc/nginx-echo.diff/modules/nginx-echo/src

.pc/nginx-echo.diff/modules/nginx-echo/src/ddebug.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_echo.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_echo.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_filter.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_filter.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_foreach.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_foreach.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_handler.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_handler.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_location.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_location.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_module.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_module.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_request_info.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_request_info.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_sleep.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_sleep.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_subrequest.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_subrequest.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_timer.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_timer.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_util.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_util.h

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_var.c

.pc/nginx-echo.diff/modules/nginx-echo/src/ngx_http_echo_var.h

.pc/nginx-echo.diff/modules/nginx-echo/test

.pc/nginx-echo.diff/modules/nginx-echo/test/inc

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Module

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Module/AutoInstall.pm

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Module/Install.pm

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Spiffy.pm

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Test

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Test/Base.pm

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Test/Builder

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Test/Builder.pm

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Test/Builder/Module.pm

.pc/nginx-echo.diff/modules/nginx-echo/test/inc/Test/More.pm

.pc/nginx-echo.diff/modules/nginx-echo/test/valgrind.suppress

.pc/nginx-echo.diff/modules/nginx-echo/util

.pc/nginx-echo.diff/modules/nginx-echo/util/build.sh

.pc/nginx-echo.diff/modules/nginx-echo/util/releng

.pc/nginx-echo.diff/modules/nginx-echo/util/update-readme.sh

.pc/nginx-echo.diff/modules/nginx-echo/util/wiki2pod.pl

.pc/nginx-html5-codecs.diff

.pc/nginx-html5-codecs.diff/conf

.pc/nginx-html5-codecs.diff/conf/mime.types

auto/lib/libatomic

auto/lib/libatomic/conf

auto/lib/libatomic/make

conf/scgi_params

conf/uwsgi_params

debian/conf/scgi_params

debian/conf/uwsgi_params

debian/help

debian/help/docs

debian/help/docs/fcgiwrap

debian/help/docs/php

debian/help/docs/support-irc

debian/help/docs/upstream

debian/help/examples

debian/help/examples/drupal

debian/help/examples/http

debian/help/examples/mail

debian/help/examples/mailman

debian/help/examples/nginx.conf

debian/help/examples/virtual_hosts

debian/help/examples/wordpress

debian/nginx.dirs

debian/nginx.docs

debian/nginx.examples

debian/patches/nginx-echo.diff

debian/patches/nginx-html5-codecs.diff

debian/ufw.profile

modules/nginx-echo

modules/nginx-echo/LICENSE

modules/nginx-echo/README

modules/nginx-echo/config

modules/nginx-echo/doc

modules/nginx-echo/doc/manpage.wiki

modules/nginx-echo/src

modules/nginx-echo/src/ddebug.h

modules/nginx-echo/src/ngx_http_echo_echo.c

modules/nginx-echo/src/ngx_http_echo_echo.h

modules/nginx-echo/src/ngx_http_echo_filter.c

modules/nginx-echo/src/ngx_http_echo_filter.h

modules/nginx-echo/src/ngx_http_echo_foreach.c

modules/nginx-echo/src/ngx_http_echo_foreach.h

modules/nginx-echo/src/ngx_http_echo_handler.c

modules/nginx-echo/src/ngx_http_echo_handler.h

modules/nginx-echo/src/ngx_http_echo_location.c

modules/nginx-echo/src/ngx_http_echo_location.h

modules/nginx-echo/src/ngx_http_echo_module.c

modules/nginx-echo/src/ngx_http_echo_module.h

modules/nginx-echo/src/ngx_http_echo_request_info.c

modules/nginx-echo/src/ngx_http_echo_request_info.h

modules/nginx-echo/src/ngx_http_echo_sleep.c

modules/nginx-echo/src/ngx_http_echo_sleep.h

modules/nginx-echo/src/ngx_http_echo_subrequest.c

modules/nginx-echo/src/ngx_http_echo_subrequest.h

modules/nginx-echo/src/ngx_http_echo_timer.c

modules/nginx-echo/src/ngx_http_echo_timer.h

modules/nginx-echo/src/ngx_http_echo_util.c

modules/nginx-echo/src/ngx_http_echo_util.h

modules/nginx-echo/src/ngx_http_echo_var.c

modules/nginx-echo/src/ngx_http_echo_var.h

modules/nginx-echo/test

modules/nginx-echo/test/inc

modules/nginx-echo/test/inc/Module

modules/nginx-echo/test/inc/Module/AutoInstall.pm

modules/nginx-echo/test/inc/Module/Install.pm

modules/nginx-echo/test/inc/Spiffy.pm

modules/nginx-echo/test/inc/Test

modules/nginx-echo/test/inc/Test/Base.pm

modules/nginx-echo/test/inc/Test/Builder

modules/nginx-echo/test/inc/Test/Builder.pm

modules/nginx-echo/test/inc/Test/Builder/Module.pm

modules/nginx-echo/test/inc/Test/More.pm

modules/nginx-echo/test/valgrind.suppress

modules/nginx-echo/util

modules/nginx-echo/util/build.sh

modules/nginx-echo/util/releng

modules/nginx-echo/util/update-readme.sh

modules/nginx-echo/util/wiki2pod.pl

src/http/modules/ngx_http_degradation_module.c

src/http/modules/ngx_http_scgi_module.c

src/http/modules/ngx_http_split_clients_module.c

src/http/modules/ngx_http_uwsgi_module.c

src/os/unix/ngx_file_aio_read.c

src/os/unix/ngx_linux_aio_read.c

files removed:
.pc/fix_reloading_ipv6.diff

.pc/fix_reloading_ipv6.diff/src

.pc/fix_reloading_ipv6.diff/src/core

.pc/fix_reloading_ipv6.diff/src/core/ngx_cycle.c

debian/dirs

debian/docs

debian/patches/fix_reloading_ipv6.diff

src/event/modules/ngx_kqueue_module.h

src/os/unix/ngx_aio.h

files modified:
.pc/applied-patches

.pc/dlopen.diff/auto/os/features

CHANGES

CHANGES.ru

auto/cc/conf

auto/cc/gcc

auto/install

auto/lib/conf

auto/lib/make

auto/lib/md5/conf

auto/lib/openssl/conf

auto/lib/pcre/conf

auto/lib/zlib/conf

auto/modules

auto/options

auto/os/features

auto/os/freebsd

auto/os/linux

auto/sources

auto/summary

conf/mime.types

configure

debian/NEWS.Debian

debian/changelog

debian/conf/fastcgi_params

debian/conf/koi-utf

debian/conf/koi-win

debian/conf/mime.types

debian/conf/nginx.conf

debian/conf/sites-available/default

debian/conf/win-utf

debian/control

debian/init.d

debian/nginx.install

debian/patches/dlopen.diff

debian/patches/series

debian/rules

src/core/nginx.c

src/core/nginx.h

src/core/ngx_buf.h

src/core/ngx_conf_file.c

src/core/ngx_conf_file.h

src/core/ngx_connection.c

src/core/ngx_connection.h

src/core/ngx_core.h

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

src/core/ngx_regex.h

src/core/ngx_resolver.c

src/core/ngx_resolver.h

src/core/ngx_string.c

src/core/ngx_string.h

src/event/modules/ngx_aio_module.c

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_poll_module.c

src/event/modules/ngx_select_module.c

src/event/modules/ngx_win32_select_module.c

src/event/ngx_event.h

src/event/ngx_event_accept.c

src/event/ngx_event_connect.c

src/event/ngx_event_connect.h

src/event/ngx_event_openssl.c

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_charset_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_geoip_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_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_range_filter_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_static_module.c

src/http/modules/ngx_http_stub_status_module.c

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/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_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.h

src/http/ngx_http_variables.c

src/http/ngx_http_variables.h

src/mail/ngx_mail.h

src/mail/ngx_mail_auth_http_module.c

src/mail/ngx_mail_handler.c

src/mail/ngx_mail_imap_handler.c

src/mail/ngx_mail_pop3_handler.c

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_smtp_handler.c

src/mail/ngx_mail_ssl_module.c

src/misc/ngx_google_perftools_module.c

src/os/unix/ngx_aio_read.c

src/os/unix/ngx_aio_read_chain.c

src/os/unix/ngx_aio_write.c

src/os/unix/ngx_aio_write_chain.c

src/os/unix/ngx_alloc.c

src/os/unix/ngx_atomic.h

src/os/unix/ngx_channel.c

src/os/unix/ngx_darwin_sendfile_chain.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.c

src/os/unix/ngx_files.h

src/os/unix/ngx_freebsd_config.h

src/os/unix/ngx_freebsd_rfork_thread.h

src/os/unix/ngx_freebsd_sendfile_chain.c

src/os/unix/ngx_gcc_atomic_x86.h

src/os/unix/ngx_linux_config.h

src/os/unix/ngx_linux_sendfile_chain.c

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

src/os/unix/ngx_recv.c

src/os/unix/ngx_solaris_config.h

src/os/unix/ngx_solaris_sendfilev_chain.c

src/os/unix/ngx_sunpro_amd64.il

src/os/unix/ngx_thread.h

src/os/unix/ngx_udp_recv.c

src/os/unix/ngx_user.h

src/os/unix/ngx_writev_chain.c

Show diffs side-by-side

added added

removed removed

src/event/modules/ngx_devpoll_module.c

369

369

dvp.dp_timeout = timer;

370

370

events = ioctl(dp, DP_POLL, &dvp);

371

371

372

if (events == -1) {

373

err = ngx_errno;

374

} else {

375

err = 0;

376

}

372

err = (events == -1) ? ngx_errno : 0;

377

373

378

374

if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) {

379

375

ngx_time_update();

Older »