diff -Nru apache2-2.4.7/debian/changelog apache2-2.4.7/debian/changelog --- apache2-2.4.7/debian/changelog 2016-04-20 11:02:26.000000000 -0500 +++ apache2-2.4.7/debian/changelog 2016-06-28 10:00:14.000000000 -0500 @@ -1,3 +1,10 @@ +apache2 (2.4.7-1ubuntu4.11) trusty; urgency=medium + + * d/p/fix_aliasmatch_long_uri.patch: Fix handling memory allocation for very + long uri in alias match (LP: #1534538) + + -- Wesley Wiedenmeier Tue, 28 Jun 2016 09:55:36 -0500 + apache2 (2.4.7-1ubuntu4.10) trusty; urgency=medium * Add apache2 specific modification needed along with fix to diff -Nru apache2-2.4.7/debian/patches/fix_aliasmatch_long_uri.patch apache2-2.4.7/debian/patches/fix_aliasmatch_long_uri.patch --- apache2-2.4.7/debian/patches/fix_aliasmatch_long_uri.patch 1969-12-31 18:00:00.000000000 -0600 +++ apache2-2.4.7/debian/patches/fix_aliasmatch_long_uri.patch 2016-06-28 10:02:05.000000000 -0500 @@ -0,0 +1,27 @@ +Description: Fix handling very long uri in aliasmatch +Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1120019 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1534538 +Origin: upstream, http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_alias.c?r1=1583175&r2=1583174&pathrev=1583175&view=patch +Last-Update: 2016-06-28 + +Index: apache2-2.4.7/modules/mappers/mod_alias.c +=================================================================== +--- apache2-2.4.7.orig/modules/mappers/mod_alias.c ++++ apache2-2.4.7/modules/mappers/mod_alias.c +@@ -371,15 +371,11 @@ static char *try_alias_list(request_rec + } + } + else { +- int pathlen = strlen(found) - +- (strlen(r->uri + regm[0].rm_eo)); +- AP_DEBUG_ASSERT(pathlen >= 0); +- AP_DEBUG_ASSERT(pathlen <= strlen(found)); + ap_set_context_info(r, + apr_pstrmemdup(r->pool, r->uri, + regm[0].rm_eo), + apr_pstrmemdup(r->pool, found, +- pathlen)); ++ strlen(found))); + } + } + else { diff -Nru apache2-2.4.7/debian/patches/series apache2-2.4.7/debian/patches/series --- apache2-2.4.7/debian/patches/series 2016-01-13 15:34:48.000000000 -0600 +++ apache2-2.4.7/debian/patches/series 2016-06-28 09:53:30.000000000 -0500 @@ -24,3 +24,4 @@ wstunnel-ssl.patch server_config_defines.patch fix_mod_proxy_wstunnel.patch +fix_aliasmatch_long_uri.patch