ubuntu/+source/nginx:applied/ubuntu/trusty-proposed

Last commit made on 2015-07-30
Get this branch:
git clone -b applied/ubuntu/trusty-proposed https://git.launchpad.net/ubuntu/+source/nginx
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/trusty-proposed
Repository:
lp:ubuntu/+source/nginx

Recent commits

75073f5... by Thomas Ward on 2015-07-29

Import patches-applied version 1.4.6-1ubuntu3.3 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 1dfa767a21712129492e2da24fe25b1c88528824
Unapplied parent: a14e0e501f19e927d43fb4c22630dd4cd390c400

New changelog entries:
  * debian/nginx-common.nginx.init: Fix pidfile extraction, due to multiple
    failure cases, using Debian's solution. (LP: #1314740)

a14e0e5... by Thomas Ward on 2015-07-29

fix incorrect cached SSL session reuse

Gbp-Pq: CVE-2014-3616.patch.

fd0aa33... by Thomas Ward on 2015-07-29

Add Ubuntu token to NGINX_VER

Gbp-Pq: ubuntu-branding.patch.

9e26907... by Thomas Ward on 2015-07-29

guard use of SSL_OP_MSIE_SSLV2_RSA_PADDING

Gbp-Pq: guard-use-of-deprecated-openssl-definition.patch.

afc3709... by Thomas Ward on 2015-07-29

Use linker flags from environment for perl (dpkg-buildflags).

Gbp-Pq: perl-use-dpkg-buildflags.patch.

0e9662f... by Thomas Ward on 2015-07-29

Import patches-unapplied version 1.4.6-1ubuntu3.3 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 474940757be5fee9a50343c04e3d9bd68dc2070f

New changelog entries:
  * debian/nginx-common.nginx.init: Fix pidfile extraction, due to multiple
    failure cases, using Debian's solution. (LP: #1314740)

1dfa767... by Thomas Ward on 2015-02-09

Import patches-applied version 1.4.6-1ubuntu3.2 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 6cb76ad5151dd8ad024ce40d071afb9cb2367081
Unapplied parent: 05b52e68b2d377d41a34af641febe6055cffd922

New changelog entries:
  * d/modules/nginx-http-push: Apply upstream bugfix. (LP: #1216817)
    * src/ngx_http_push_module_setup.c: Modify push module code with
      upstream changes to fix an issue with initialization when using
      `fastcgi_cache` or `proxy_cache`.
    * tests/nginx-cachemanager.conf: (new file) Include upstream change
      of adding an nginx-cachemanager.conf file to the tests.

4749407... by Thomas Ward on 2015-02-09

Import patches-unapplied version 1.4.6-1ubuntu3.2 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 73fef2ab7d6d57ea7a79fb04360963f1ba22f142

New changelog entries:
  * d/modules/nginx-http-push: Apply upstream bugfix. (LP: #1216817)
    * src/ngx_http_push_module_setup.c: Modify push module code with
      upstream changes to fix an issue with initialization when using
      `fastcgi_cache` or `proxy_cache`.
    * tests/nginx-cachemanager.conf: (new file) Include upstream change
      of adding an nginx-cachemanager.conf file to the tests.

05b52e6... by Thomas Ward on 2015-02-09

fix incorrect cached SSL session reuse

Gbp-Pq: CVE-2014-3616.patch.

cd679e3... by Thomas Ward on 2015-02-09

Add Ubuntu token to NGINX_VER

Gbp-Pq: ubuntu-branding.patch.