← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/nginx/intrepid-security

~ubuntu-branches/ubuntu/intrepid/nginx/intrepid-security

Viewing all changes in revision 18.

Committer: Bazaar Package Importer
Author(s): Emanuele Gentili
Date: 2008-08-08 09:28:21 UTC
mfrom: (1.1.8 upstream)
Revision ID: james.westby@ubuntu.com-20080808092821-0rj2n12iw8xd5r5l

Tags: 0.6.32-1ubuntu1

* Merge from debian unstable, remaining changes:
+ debian/control:
  - Add Depend on lsb >= 3.2-14, which has the status_of_proc() function.
+ debian/init.d:
  - Add sourcing to '. /lib/lsb/init-functions'
  - Add the 'status' action
+ Fixed FTBFS on ubuntu by properly defining IOV_MAX to its Linux
   equivelent.
+ Added dpatch based patch system

files modified:
CHANGES

CHANGES.ru

auto/install

auto/lib/conf

auto/lib/md5/conf

auto/lib/pcre/conf

auto/lib/sha1/conf

auto/summary

debian/changelog

debian/control

src/core/nginx.c

src/core/nginx.h

src/core/ngx_config.h

src/core/ngx_connection.c

src/core/ngx_cycle.c

src/core/ngx_cycle.h

src/core/ngx_open_file_cache.c

src/core/ngx_resolver.c

src/core/ngx_string.h

src/event/modules/ngx_kqueue_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/event/ngx_event_pipe.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_log_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/perl/nginx.pm

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_header_filter_module.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_special_response.c

src/http/ngx_http_variables.c

src/http/ngx_http_variables.h

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_ssl_module.c

src/os/unix/ngx_linux_config.h

src/os/unix/ngx_posix_config.h

src/os/unix/ngx_process_cycle.c

Show diffs side-by-side

added added

removed removed

auto/lib/md5/conf

auto/lib/pcre/conf

auto/lib/sha1/conf

debian/changelog

src/core/nginx.c

src/core/nginx.h

src/core/ngx_config.h

src/core/ngx_connection.c

src/core/ngx_cycle.c

src/core/ngx_cycle.h

src/core/ngx_open_file_cache.c

src/core/ngx_resolver.c

src/core/ngx_string.h

src/event/modules/ngx_kqueue_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/event/ngx_event_pipe.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_log_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/perl/nginx.pm

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_header_filter_module.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_special_response.c

src/http/ngx_http_variables.c

src/http/ngx_http_variables.h

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_ssl_module.c

src/os/unix/ngx_linux_config.h

src/os/unix/ngx_posix_config.h

src/os/unix/ngx_process_cycle.c

Older »