Author: rjung
Date: Fri Nov 2 16:26:28 2007
New Revision: 591512
URL: http://svn.apache.org/viewvc?rev=591512&view=rev
Log:
Apache: Allow JkMount and JkUnMount patterns to start with '*' and '?' in
addition to '/'.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=591512&r1=591511&r2=591512&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Fri Nov 2 16:26:28
2007
@@ -867,8 +867,8 @@
return "JkMount can not have a path when defined in a location";
}
- if (c[0] != '/')
- return "JkMount context should start with /";
+ if (c[0] != '/' && c[0] != '?' && c[0] != '*')
+ return "JkMount context should start with '/', '*' or '?'.";
/*
* Add the new worker to the alias map.
@@ -909,8 +909,8 @@
else
return "JkUnMount can not have a path when defined in a location";
}
- if (c[0] != '/')
- return "JkUnMount context should start with /";
+ if (c[0] != '/' && c[0] != '?' && c[0] != '*')
+ return "JkUnMount context should start with '/', '*' or '?'.";
uri = ap_pstrcat(cmd->temp_pool, "!", c, NULL);
/*
* Add the new worker to the alias map.
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=591512&r1=591511&r2=591512&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Nov 2 16:26:28
2007
@@ -895,8 +895,8 @@
return "JkMount can not have a path when defined in a location";
}
- if (c[0] != '/')
- return "JkMount context should start with /";
+ if (c[0] != '/' && c[0] != '?' && c[0] != '*')
+ return "JkMount context should start with '/', '*' or '?'.";
/*
* Add the new worker to the alias map.
@@ -938,8 +938,8 @@
return "JkUnMount can not have a path when defined in a location";
}
- if (c[0] != '/')
- return "JkUnMount context should start with /";
+ if (c[0] != '/' && c[0] != '?' && c[0] != '*')
+ return "JkUnMount context should start with '/', '*' or '?'.";
uri = apr_pstrcat(cmd->temp_pool, "!", c, NULL);
/*
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=591512&r1=591511&r2=591512&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Nov 2
16:26:28 2007
@@ -43,6 +43,10 @@
<br />
<subsection name="Native">
<changelog>
+ <update>
+ Apache: Allow JkMount and JkUnMount patterns to start with '*' and '?'
+ in addition to '/'. (rjung)
+ </update>
<fix>
<bug>43684</bug>: Replace JkMountFile by JkMountFileReload in
uriworkermap.properties docs. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
