lp:~groldster/ubuntu/maverick/nginx/merge-from-sid-0.7.67-2
- Get this branch:
- bzr branch lp:~groldster/ubuntu/maverick/nginx/merge-from-sid-0.7.67-2
Branch merges
- Daniel Holbach (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 4347 lines (+2367/-363)83 files modified.pc/applied-patches (+1/-0)
.pc/fix_reloading_ipv6.diff/src/core/ngx_cycle.c (+1343/-0)
CHANGES (+121/-0)
CHANGES.ru (+126/-2)
auto/cc/conf (+1/-0)
auto/cc/gcc (+0/-2)
auto/feature (+1/-1)
auto/lib/openssl/conf (+2/-0)
auto/lib/openssl/make (+1/-1)
auto/lib/openssl/makefile.bcc (+1/-2)
auto/lib/openssl/makefile.msvc (+1/-2)
auto/lib/zlib/make (+3/-3)
auto/modules (+8/-8)
auto/unix (+10/-0)
debian/README.Debian (+9/-0)
debian/changelog (+101/-0)
debian/conf/mime.types (+2/-0)
debian/conf/sites-available/default (+7/-4)
debian/control (+2/-1)
debian/copyright (+37/-36)
debian/init.d (+2/-1)
debian/patches/fix_reloading_ipv6.diff (+15/-0)
debian/patches/series (+1/-0)
debian/rules (+10/-5)
src/core/nginx.h (+2/-2)
src/core/ngx_cycle.c (+2/-2)
src/core/ngx_file.c (+6/-4)
src/core/ngx_open_file_cache.c (+8/-1)
src/core/ngx_string.c (+2/-2)
src/core/ngx_times.c (+73/-9)
src/core/ngx_times.h (+2/-1)
src/event/modules/ngx_devpoll_module.c (+2/-2)
src/event/modules/ngx_epoll_module.c (+2/-2)
src/event/modules/ngx_eventport_module.c (+2/-2)
src/event/modules/ngx_kqueue_module.c (+3/-3)
src/event/modules/ngx_poll_module.c (+2/-2)
src/event/modules/ngx_rtsig_module.c (+4/-4)
src/event/modules/ngx_select_module.c (+2/-2)
src/event/modules/ngx_win32_select_module.c (+1/-1)
src/event/ngx_event.c (+0/-2)
src/event/ngx_event_openssl.c (+12/-2)
src/event/ngx_event_openssl.h (+1/-0)
src/http/modules/ngx_http_autoindex_module.c (+0/-4)
src/http/modules/ngx_http_chunked_filter_module.c (+10/-2)
src/http/modules/ngx_http_dav_module.c (+7/-11)
src/http/modules/ngx_http_fastcgi_module.c (+11/-0)
src/http/modules/ngx_http_flv_module.c (+0/-4)
src/http/modules/ngx_http_geo_module.c (+1/-1)
src/http/modules/ngx_http_geoip_module.c (+80/-28)
src/http/modules/ngx_http_gzip_static_module.c (+1/-5)
src/http/modules/ngx_http_image_filter_module.c (+33/-13)
src/http/modules/ngx_http_index_module.c (+0/-4)
src/http/modules/ngx_http_memcached_module.c (+8/-3)
src/http/modules/ngx_http_proxy_module.c (+22/-2)
src/http/modules/ngx_http_random_index_module.c (+0/-4)
src/http/modules/ngx_http_referer_module.c (+20/-11)
src/http/modules/ngx_http_rewrite_module.c (+4/-7)
src/http/modules/ngx_http_ssi_filter_module.c (+17/-21)
src/http/modules/ngx_http_static_module.c (+1/-5)
src/http/modules/ngx_http_userid_filter_module.c (+1/-1)
src/http/modules/perl/nginx.pm (+1/-1)
src/http/modules/perl/nginx.xs (+1/-4)
src/http/modules/perl/ngx_http_perl_module.c (+0/-10)
src/http/ngx_http_cache.h (+5/-0)
src/http/ngx_http_copy_filter_module.c (+3/-1)
src/http/ngx_http_core_module.c (+29/-10)
src/http/ngx_http_core_module.h (+1/-0)
src/http/ngx_http_file_cache.c (+68/-2)
src/http/ngx_http_header_filter_module.c (+2/-2)
src/http/ngx_http_parse.c (+19/-38)
src/http/ngx_http_request.c (+28/-7)
src/http/ngx_http_request.h (+3/-4)
src/http/ngx_http_special_response.c (+11/-13)
src/http/ngx_http_upstream.c (+13/-10)
src/http/ngx_http_upstream.h (+1/-0)
src/http/ngx_http_variables.c (+6/-10)
src/http/ngx_http_variables.h (+1/-1)
src/mail/ngx_mail_pop3_handler.c (+0/-2)
src/mail/ngx_mail_proxy_module.c (+1/-1)
src/os/unix/ngx_errno.h (+13/-1)
src/os/unix/ngx_files.h (+4/-0)
src/os/unix/ngx_process.c (+7/-6)
src/os/unix/ngx_process_cycle.c (+3/-3)
Related source package recipes
Related bugs
| Bug #608172: please merge nginx 0.7.67 (httpd) from Debian unstable (httpd) | Wishlist | Fix Released |
|
Related blueprints
Branch information
- Owner:
- Mikhail Turov
- Status:
- Development
Recent revisions
- 32. By Mikhail Turov
-
* Merge from Debian unstable (LP: #608172) Remaining changes:
+ debian/rules:
with-http_dav_ module
with-http_geoip_ module
with-http_gzip_ static_ module
with-http_realip_ module
with-http_sub_ module
+ .pc/applied-patches
fix_reloading_ ipv6.diff
* debian/conf/sites- available/ default:
+ Removed reference to SSLv2 protocol (Closes: #589139)
* debian/control:
+ Updated Standards-Version to 3.9.0
* debian/copyright:
+ Don't point to BSD license file, included exact upstream version of
license text
+ Added missing copyright owner for contrib/ scripts
+ debian/* license is same as upstream now as discussed with co-maintainers
* New upstream release
* debian/rules:
+ Enabled HTTPSubModule module in configure (Closes: #584828)
+ Arranged configure options in better manner
* debian/README. Debian:
+ Fixed typo and somewhat better wordings
* debian/conf/mime. types:
+ Added entry to support 7zip files (Closes: #580423)
* debian/init.d:
+ Do not print config testing info until an error found, Thanks to Ubuntu
bug 568293
* debian/copyright:
+ Updated as per DEP-5 specification
* debian/patches/ fix_reloading_ ipv6.diff:
+ Added patch to fix reloading with IPv6 addresses, Thanks to
Matthias-Christian Ott <email address hidden> for patch (Closes: #577456)
* debian/conf/sites- available/ default:
+ Really listen for both IPv4 and IPv6 addresses. Thanks to Nikolaus
Schulz <email address hidden> for notice (Closes: #574983)
* debian/control, debian/rules:
+ Added GeoIP support, Thanks to Caetano Carezzato
<email address hidden> (Closes: #575280)
* debian/conf/mime. types:
+ Added svg entry to mime.types, Jeremy Lal <email address hidden>
(Closes: #575155)
* Urgency set to medium due to Release Goal
* debian/conf/sites- available/ default:
+ Listen for both IPv4 and IPv6 addresses by default (Closes: #574983)
* debian/README. Debian:
+ Added explanation about not installing files in /var/www/
(Closes: #572513)
* debian/rules:
+ Readded realip module support (Closes: #507419) - 31. By Daniel Hahler
-
Re-enable http_realip_module (debian/rules).
Apparently got lost by accident for the 0.7 branch (Closes: #507419)
LP: #268750 - 30. By Daniel Hahler
-
* Merge from debian testing. (LP: #531655) Remaining changes:
- Add a UFW profile set:
+ debian/nginx.ufw. profile: Added.
+ debian/control: nginx: Suggests ufw.
+ debian/dirs: Add 'etc/ufw/applications. d'
+ debian/rules: Add install rule for the nginx UFW profile.
- Install html files.
- debian/dirs: Add 'var/www/nginx-default' .
- debian/nginx.install: Add 'html/* var/www/ nginx-default' . - 29. By Mathieu Trudel-Lapierre
-
* Merge from debian testing (LP: #513099), remaining changes:
- Install html files.
- debian/dirs: Add 'var/www/nginx-default' .
- debian/nginx.install: Add 'html/* var/www/ nginx-default' .
- Add a UFW profile set:
+ debian/nginx.ufw. profile: Added.
+ debian/control: nginx: Suggests ufw.
+ debian/dirs: Add 'etc/ufw/applications. d'
+ debian/rules: Add install rule for the nginx UFW profile.
* Fixes CVE-2009-3555, as per changelog entry in 0.7.64-1. (LP: #511681) - 28. By Andres Rodriguez
-
* Merge from debian testing (LP: #490450), remaining changes:
- Install html files.
- debian/dirs: Add 'var/www/nginx-default' .
- debian/nginx.install: Add 'html/* var/www/ nginx-default' .
- Added a UFW profile set: (LP: #308695)
+ debian/nginx.ufw. profile: Added.
+ debian/control: nginx: Suggests ufw.
+ debian/dirs: Added 'etc/ufw/applications. d'
+ debian/rules: Added install rule for the nginx UFW profile. - 27. By Daniel Hahler
-
* Merge from debian unstable (LP: #450874), remaining changes:
- Install html files.
- debian/dirs: Add 'var/www/nginx-default' .
- debian/nginx.install: Add 'html/* var/www/ nginx-default' .
- Added a UFW profile set: (LP: #308695)
+ debian/nginx.ufw. profile: Added.
+ debian/control: nginx: Suggests ufw.
+ debian/dirs: Added 'etc/ufw/applications. d'
+ debian/rules: Added install rule for the nginx UFW profile.
* Closes: LP: #260005, LP: #440888 - 26. By Andres Rodriguez
-
* Install html files.
- debian/dirs: Add 'var/www/nginx-default' .
- debian/nginx.install: Add 'html/* var/www/ nginx-default' .
* SECURITY UPDATE (CVE-2009-2629): Buffer underflow vulnerability, which
allows remote attackers to execute arbitrary code via crafted HTTP
request. (LP: #430064)
- src/http/ngx_http_ parse.c patched. - 25. By Andres Rodriguez
-
* Merge from debian unstable (LP: #416635), remaining changes:
- Readd status action to init script:
+ debian/init.d:
- Add sourcing to '. /lib/lsb/init-functions'
- Add 'status' action.
+ debian/control: Add Depend on lsb >= 3.2-14, which has the
statuc_of_proc( ) function.
- Added a UFW profile set: (LP: #308695)
+ debian/nginx.ufw. profile: Added.
+ debian/control: nginx: Suggests ufw.
+ debian/dirs: Added 'etc/ufw/applications. d'
+ debian/rules: Added install rule for the nginx UFW profile.
- Added support for gzip_static module: (LP: #346010)
+ debian/rules: Added '--with-http_gzip_ static_ module' to configure. - 24. By Andres Rodriguez
-
* Readd status action to init script: (LP: #251985)
- debian/init.d:
+ Add sourcing to '. /lib/lsb/init-functions'
+ Add 'status' action.
- debian/control: Add Depend on lsb >= 3.2-14, which has the
statuc_of_proc( ) function.
* Added a UFW profile set: (LP: #308695)
- debian/nginx.ufw. profile: Added.
- debian/control: nginx: Suggests ufw.
- debian/dirs: Added 'etc/ufw/applications. d'
- debian/rules: Added install rule for the nginx UFW profile.
* Added support for gzip_static module: (LP: #346010)
- debian/rules: Added '--with-http_gzip_ static_ module' to configure.
* debian/control: Update Maintainer field to match Ubuntu Developers. - 23. By Fabio Tranchitella
-
* 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)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/maverick/nginx
Ubuntu Sponsors
