You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2015/01/06 16:21:07 UTC
svn commit: r1649828 - /tomcat/jk/trunk/native/common/jk_uri_worker_map.c
Author: rjung
Date: Tue Jan 6 15:21:07 2015
New Revision: 1649828
URL: http://svn.apache.org/r1649828
Log:
Revert unintentional commit part of r1649807.
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=1649828&r1=1649827&r2=1649828&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 15:21:07 2015
@@ -1074,8 +1074,6 @@ const char *map_uri_to_worker_ext(jk_uri
int reject_unsafe;
int collapse_slashes;
int rv = -1;
- size_t uri_len;
- size_t remain;
char url[JK_MAX_URI_LEN+1];
JK_TRACE_ENTER(l);
@@ -1144,13 +1142,11 @@ const char *map_uri_to_worker_ext(jk_uri
/* Make the copy of the provided uri and strip
* everything after the first ';' char.
*/
- uri_len = strlen(uri);
- remain = JK_MAX_URI_LEN - vhost_len;
- for (i = 0; i < uri_len; i++) {
- if (i == remain) {
+ for (i = 0; i < strlen(uri); i++) {
+ if (i == JK_MAX_URI_LEN) {
jk_log(l, JK_LOG_WARNING,
"URI %s is invalid. URI must be smaller than %d chars",
- uri, remain);
+ uri, JK_MAX_URI_LEN);
JK_TRACE_EXIT(l);
return NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org