svn commit: r1649849 - /tomcat/jk/trunk/native/common/jk_uri_worker_map.c

[rj...@apache.org]

Author: rjung
Date: Tue Jan  6 16:06:08 2015
New Revision: 1649849

URL: http://svn.apache.org/r1649849
Log:
Fix compiler error (declare at start of block).

Modified:
    tomcat/jk/trunk/native/common/jk_uri_worker_map.c

Modified: tomcat/jk/trunk/native/common/jk_uri_worker_map.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_uri_worker_map.c?rev=1649849&r1=1649848&r2=1649849&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/jk/trunk/native/common/jk_uri_worker_map.c Tue Jan  6 16:06:08 2015
@@ -1186,6 +1186,7 @@ const char *map_uri_to_worker_ext(jk_uri
 
     /* In case we found a match, check for the unmounts. */
     if (rv >= 0 && IND_THIS(uw_map->nosize)) {
+        int rc;
         if (collapse_slashes == JK_COLLAPSE_UNMOUNT) {
             /* Remove multiple slashes when looking for
              * unmount to prevent trivial unmount bypass attack.
@@ -1194,7 +1195,7 @@ const char *map_uri_to_worker_ext(jk_uri
             jk_no2slash(url);
         }
         /* Again first including vhost. */
-        int rc = is_nomatch(uw_map, url, rv, l);
+        rc = is_nomatch(uw_map, url, rv, l);
         /* If no unmount was found, try without vhost. */
         if (!rc && vhost_len)
             rc = is_nomatch(uw_map, &url[vhost_len], rv, l);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org