tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r591629 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/common/jk_uri_worker_map.c xdocs/miscellaneous/changelog.xml
Date Sat, 03 Nov 2007 15:09:59 GMT
Author: rjung
Date: Sat Nov  3 08:09:58 2007
New Revision: 591629

URL: http://svn.apache.org/viewvc?rev=591629&view=rev
Log:
Revert changes from r591512 and r591522.
(was: 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/native/common/jk_uri_worker_map.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=591629&r1=591628&r2=591629&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 Sat Nov  3 08:09:58 2007
@@ -867,8 +867,8 @@
             return "JkMount can not have a path when defined in a location";
     }
 
-    if (c[0] != '/' && c[0] != '?' && c[0] != '*')
-        return "JkMount context should start with '/', '*' or '?'.";
+    if (c[0] != '/')
+        return "JkMount context should start with /";
 
     /*
      * 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] != '/' && c[0] != '?' && c[0] != '*')
-        return "JkUnMount context should start with '/', '*' or '?'.";
+    if (c[0] != '/')
+        return "JkUnMount context should start with /";
     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=591629&r1=591628&r2=591629&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 Sat Nov  3 08:09:58 2007
@@ -895,8 +895,8 @@
             return "JkMount can not have a path when defined in a location";
     }
 
-    if (c[0] != '/' && c[0] != '?' && c[0] != '*')
-        return "JkMount context should start with '/', '*' or '?'.";
+    if (c[0] != '/')
+        return "JkMount context should start with /";
 
     /*
      * 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] != '/' && c[0] != '?' && c[0] != '*')
-        return "JkUnMount context should start with '/', '*' or '?'.";
+    if (c[0] != '/')
+        return "JkUnMount context should start with /";
 
     uri = apr_pstrcat(cmd->temp_pool, "!", c, NULL);
     /*

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=591629&r1=591628&r2=591629&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sat Nov  3 08:09:58 2007
@@ -363,7 +363,7 @@
         return JK_FALSE;
     }
 
-    if (*uri == '/' || *uri == '*' || *uri == '?') {
+    if (*uri == '/') {
         uwr->uri = uri;
         uwr->context = uri;
         uwr->worker_name = jk_pool_strdup(&uw_map->p, worker);
@@ -397,7 +397,7 @@
          * not arrive here when using Apache.
          */
         jk_log(l, JK_LOG_ERROR,
-               "invalid context '%s': does not begin with '/', '*' or '?'",
+               "invalid context '%s': does not begin with '/'",
                uri);
         JK_TRACE_EXIT(l);
         return JK_FALSE;

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=591629&r1=591628&r2=591629&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Nov  3 08:09:58 2007
@@ -43,10 +43,6 @@
   <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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message