← Back to branch summary

~britco/nginx/master

~britco/nginx/master

« back to all changes in this revision

Viewing changes to src/core/ngx_inet.c

Committer: Bazaar Package Importer
Author(s): Jose Parrella
Date: 2007-12-08 11:27:54 UTC
mto: (4.1.1 lenny) (1.3.1 upstream) (15.1.1 experimental)
mto: This revision was merged to the branch mainline in revision 11.
Revision ID: james.westby@ubuntu.com-20071208112754-3yzna05lribq11lk

Tags: upstream-0.5.33

Import upstream version 0.5.33

files added:
src/mail/ngx_mail_imap_handler.c

src/mail/ngx_mail_imap_module.c

src/mail/ngx_mail_imap_module.h

src/mail/ngx_mail_pop3_handler.c

src/mail/ngx_mail_pop3_module.c

src/mail/ngx_mail_pop3_module.h

src/mail/ngx_mail_smtp_handler.c

src/mail/ngx_mail_smtp_module.c

src/mail/ngx_mail_smtp_module.h

files modified:
CHANGES

CHANGES.ru

auto/cc/sunc

auto/init

auto/lib/pcre/conf

auto/modules

auto/options

auto/os/solaris

auto/sources

auto/types/uintptr_t

conf/fastcgi_params

conf/mime.types

src/core/nginx.c

src/core/nginx.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_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_palloc.c

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

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_kqueue_module.h

src/event/modules/ngx_poll_module.c

src/event/modules/ngx_rtsig_module.c

src/event/modules/ngx_select_module.c

src/event/ngx_event.c

src/event/ngx_event.h

src/event/ngx_event_busy_lock.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/event/ngx_event_pipe.h

src/http/modules/ngx_http_access_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_gzip_filter_module.c

src/http/modules/ngx_http_headers_filter_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_proxy_module.c

src/http/modules/ngx_http_realip_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssi_filter_module.h

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_upstream_ip_hash_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_copy_filter_module.c

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

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

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

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_ssl_module.c

src/os/unix/ngx_aio_write_chain.c

src/os/unix/ngx_atomic.h

src/os/unix/ngx_freebsd_config.h

src/os/unix/ngx_freebsd_sendfile_chain.c

src/os/unix/ngx_linux_config.h

src/os/unix/ngx_linux_sendfile_chain.c

src/os/unix/ngx_posix_config.h

src/os/unix/ngx_process_cycle.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_sunpro_x86.il

src/os/unix/ngx_writev_chain.c

Show diffs side-by-side

added added

removed removed

src/core/ngx_inet.c

214

214

215

215

in_cidr->mask = htonl((ngx_uint_t) (0 - (1 << (32 - m))));

216

216

217

return NGX_OK;

217

if (in_cidr->addr == (in_cidr->addr & in_cidr->mask)) {

218

return NGX_OK;

219

}

220

221

in_cidr->addr &= in_cidr->mask;

222

223

return NGX_DONE;

218

224

}

219

225

220

226

Older »