← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat6/vivid-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/connector/Connector.java

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2014-02-17 00:02:00 UTC
  • mfrom: (1.2.10)
  • Revision ID: package-import@ubuntu.com-20140217000200-qs6ki7bhqnfhkas7
Tags: 6.0.39-1
* Team upload.
* New upstream release.
  - Refreshed the patches
* Standards-Version updated to 3.9.5 (no changes)
* Switch to debhelper level 9
* Use XZ compression for the upstream tarball
* Use canonical URL for the Vcs-Git field

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/connector/Connector.java
51
51
 *
52
52
 * @author Craig R. McClanahan
53
53
 * @author Remy Maucherat
54
 
 * @version $Id: Connector.java 1394104 2012-10-04 14:55:59Z markt $
 
54
 * @version $Id: Connector.java 1521514 2013-09-10 14:44:15Z schultz $
55
55
 */
56
56
 
57
57
 
312
312
         replacements.put("keystoreType", "keytype");
313
313
         replacements.put("sslProtocol", "protocol");
314
314
         replacements.put("sslProtocols", "protocols");
 
315
         replacements.put("sslEnabledProtocols", "protocols");
315
316
     }
316
317
 
317
318