~ubuntu-branches/ubuntu/maverick/tomcat6/maverick

« back to all changes in this revision

Viewing changes to debian/patches/disable-apr-loading.patch

  • Committer: Bazaar Package Importer
  • Author(s): Torsten Werner
  • Date: 2010-06-28 21:41:31 UTC
  • mfrom: (2.2.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100628214131-3wktukpb3lgdf83h
Tags: 6.0.26-5
* Convert patches to dep3 format.
* Backport security fix from trunk to fix CVE-2010-1157. (Closes: #587447)
* Set urgency to medium due to the security fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- a/conf/server.xml
2
 
+++ b/conf/server.xml
3
 
@@ -22,7 +22,9 @@
4
 
 <Server port="8005" shutdown="SHUTDOWN">
5
 
 
6
 
   <!--APR library loader. Documentation at /docs/apr.html -->
7
 
+  <!--
8
 
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
9
 
+  -->
10
 
   <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
11
 
   <Listener className="org.apache.catalina.core.JasperListener" />
12
 
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->