From 8f9bec19e4409d0fd4877cd80adea6f85c1c76f9 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 8 Aug 2011 10:42:49 +0000
Subject: [PATCH] Upadte to 1.1.22 of the native connector

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154911 13f79535-47bb-0310-9956-ffa450edef68
---
 build.properties.default                                | 2 +-
 java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
 webapps/docs/changelog.xml                              | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 062a50a32..819d08225 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,7 +129,7 @@ jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-
 jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
 
 # ----- Tomcat native library -----
-tomcat-native.version=1.1.20
+tomcat-native.version=1.1.22
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index 693c1fc59..58cf3a6cb 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -61,7 +61,7 @@ public class AprLifecycleListener
     protected static final int TCN_REQUIRED_MINOR = 1;
     protected static final int TCN_REQUIRED_PATCH = 17;
     protected static final int TCN_RECOMMENDED_MINOR = 1;
-    protected static final int TCN_RECOMMENDED_PV = 20;
+    protected static final int TCN_RECOMMENDED_PV = 22;
 
 
     // ---------------------------------------------- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f909a4ccd..418e6e6f4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -305,6 +305,10 @@
       <fix>
         Fix a small number of warnings reported by FindBugs. (markt)
       </fix>
+      <update>
+        Update to version 1.1.22 of the native component for the AJP APR/native
+        and HTTP APR/native connectors. (markt)
+      </update>
     </changelog>
   </subsection>
 </section>
-- 
2.11.0