Author: markt
Date: Fri Aug 24 14:42:42 2018
New Revision: 1838871
URL: http://svn.apache.org/viewvc?rev=1838871&view=rev
Log:
Remove unnecessary processing of CollapseSlashes option
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/common/jk_uri_worker_map.c
tomcat/jk/trunk/native/common/jk_uri_worker_map.h
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1838871&r1=1838870&r2=1838871&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Fri Aug 24 14:42:42 2018
@@ -713,18 +713,6 @@ static void dump_options(server_rec *srv
jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
"RejectUnsafeURI", server_name,
JK_OPT_DEFAULT & JK_OPT_REJECTUNSAFE ? " (default)" : "");
- if (options & JK_OPT_COLLAPSEALL)
- jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
- "CollapseSlashesAll", server_name,
- JK_OPT_DEFAULT & JK_OPT_COLLAPSEALL ? " (default)" : "");
- if (options & JK_OPT_COLLAPSENONE)
- jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
- "CollapseSlashesNone", server_name,
- JK_OPT_DEFAULT & JK_OPT_COLLAPSENONE ? " (default)" : "");
- if (options & JK_OPT_COLLAPSEUNMOUNT)
- jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
- "CollapseSlashesUnmount", server_name,
- JK_OPT_DEFAULT & JK_OPT_COLLAPSEUNMOUNT ? " (default)" : "");
}
/* ========================================================================= */
@@ -2307,11 +2295,10 @@ static const char *jk_set_options(cmd_pa
mask = 0;
if (action == '-' &&
- (!strncasecmp(w, "ForwardURI", strlen("ForwardURI")) ||
- !strncasecmp(w, "CollapseSlashes", strlen("CollapseSlashes"))))
+ (!strncasecmp(w, "ForwardURI", strlen("ForwardURI")))) {
return apr_pstrcat(cmd->pool, "JkOptions: Illegal option '-", w,
"': option can not be disabled", NULL);
-
+ }
if (!strcasecmp(w, "ForwardURICompat")) {
opt = JK_OPT_FWDURICOMPAT;
mask = JK_OPT_FWDURIMASK;
@@ -3700,21 +3687,9 @@ static int jk_post_config(apr_pool_t * p
uri_worker_map_switch(sconf->uw_map, sconf->log);
uri_worker_map_load(sconf->uw_map, sconf->log);
}
- switch (sconf->options & JK_OPT_COLLAPSEMASK) {
- case JK_OPT_COLLAPSEALL:
- sconf->uw_map->collapse_slashes = JK_COLLAPSE_ALL;
- break;
- case JK_OPT_COLLAPSENONE:
- sconf->uw_map->collapse_slashes = JK_COLLAPSE_NONE;
- break;
- case JK_OPT_COLLAPSEUNMOUNT:
- sconf->uw_map->collapse_slashes =
JK_COLLAPSE_UNMOUNT;
- break;
- default:
+ if (sconf->options & JK_OPT_COLLAPSEMASK) {
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
- "Collapse slashes value %d ignored,
setting to %d",
- sconf->options & JK_OPT_COLLAPSEMASK,
JK_COLLAPSE_DEFAULT);
- sconf->uw_map->collapse_slashes =
JK_COLLAPSE_DEFAULT;
+ "Deprecated CollapseSlashes setting
ignored");
}
}
else {
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1838871&r1=1838870&r2=1838871&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Fri Aug 24 14:42:42 2018
@@ -277,7 +277,7 @@ extern "C"
#define JK_OPT_COLLAPSENONE 0x2000
#define JK_OPT_COLLAPSEUNMOUNT 0x4000
-#define JK_OPT_DEFAULT (JK_OPT_FWDURIDEFAULT | JK_OPT_FWDKEYSIZE
| JK_OPT_COLLAPSEUNMOUNT)
+#define JK_OPT_DEFAULT (JK_OPT_FWDURIDEFAULT | JK_OPT_FWDKEYSIZE)
/* Check for EBCDIC systems */
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=1838871&r1=1838870&r2=1838871&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/jk/trunk/native/common/jk_uri_worker_map.c Fri Aug 24 14:42:42 2018
@@ -176,10 +176,9 @@ static void uri_worker_map_dump(jk_uri_w
int i, off;
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG, "uri map dump %s: id=%d, index=%d
file='%s' reject_unsafe=%d "
- "collapse_slashes=%d reload=%d modified=%d checked=%d",
+ "reload=%d modified=%d checked=%d",
reason, uw_map->id, uw_map->index,
STRNULL_FOR_NULL(uw_map->fname),
- uw_map->reject_unsafe, uw_map->collapse_slashes,
- uw_map->reload, uw_map->modified, uw_map->checked);
+ uw_map->reject_unsafe, uw_map->reload, uw_map->modified,
uw_map->checked);
}
for (i = 0; i <= 1; i++) {
jk_log(l, JK_LOG_DEBUG, "generation %d: size=%d nosize=%d
capacity=%d",
@@ -245,7 +244,6 @@ int uri_worker_map_alloc(jk_uri_worker_m
uw_map->index = 0;
uw_map->fname = NULL;
uw_map->reject_unsafe = 0;
- uw_map->collapse_slashes = JK_COLLAPSE_DEFAULT;
uw_map->reload = JK_URIMAP_DEF_RELOAD;
uw_map->modified = 0;
uw_map->checked = 0;
@@ -1074,7 +1072,6 @@ const char *map_uri_to_worker_ext(jk_uri
unsigned int i;
unsigned int vhost_len;
int reject_unsafe;
- int collapse_slashes;
size_t uri_len;
size_t remain;
int rv = -1;
@@ -1115,7 +1112,6 @@ const char *map_uri_to_worker_ext(jk_uri
}
}
reject_unsafe = uw_map->reject_unsafe;
- collapse_slashes = uw_map->collapse_slashes;
vhost_len = 0;
/*
* In case we got a vhost, we prepend a slash
Modified: tomcat/jk/trunk/native/common/jk_uri_worker_map.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_uri_worker_map.h?rev=1838871&r1=1838870&r2=1838871&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_uri_worker_map.h (original)
+++ tomcat/jk/trunk/native/common/jk_uri_worker_map.h Fri Aug 24 14:42:42 2018
@@ -58,11 +58,6 @@ extern "C"
#define MATCH_TYPE_STOPPED 0x4000
*/
-#define JK_COLLAPSE_ALL 0x0001
-#define JK_COLLAPSE_NONE 0x0002
-#define JK_COLLAPSE_UNMOUNT 0x0003
-#define JK_COLLAPSE_DEFAULT JK_COLLAPSE_UNMOUNT
-
#define SOURCE_TYPE_WORKERDEF 0x0001
#define SOURCE_TYPE_JKMOUNT 0x0002
#define SOURCE_TYPE_URIMAP 0x0003
@@ -172,9 +167,7 @@ struct jk_uri_worker_map
JK_CRIT_SEC cs;
/* should we forward potentially unsafe URLs */
- int reject_unsafe;
- /* how to handle multiple adjacent slashes in URLs */
- int collapse_slashes;
+ int reject_unsafe;
/* uriworkermap filename */
const char *fname;
/* uriworkermap reload check interval */
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1838871&r1=1838870&r2=1838871&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Fri Aug 24 14:42:42 2018
@@ -133,9 +133,6 @@ static char HTTP_WORKER_HEADER_INDEX[RES
#define AUTH_COMPLETE_TAG "auth_complete"
#define REJECT_UNSAFE_TAG "reject_unsafe"
#define COLLAPSE_SLASHES_TAG "collapse_slashes"
-#define COLLAPSE_SLASHES_ALL_VERB "all"
-#define COLLAPSE_SLASHES_NONE_VERB "none"
-#define COLLAPSE_SLASHES_UNMOUNT_VERB "unmount"
#define WATCHDOG_INTERVAL_TAG "watchdog_interval"
#define ENABLE_CHUNKED_ENCODING_TAG "enable_chunked_encoding"
#define ERROR_PAGE_TAG "error_page"
@@ -510,7 +507,6 @@ static int strip_session = 0;
static int use_auth_notification_flags = 1;
static int chunked_encoding_enabled = JK_FALSE;
static int reject_unsafe = 0;
-static int collapse_slashes = JK_COLLAPSE_DEFAULT;
static volatile int watchdog_interval = 0;
static HANDLE watchdog_handle = NULL;
static char error_page_buf[INTERNET_MAX_URL_LENGTH] = {0};
@@ -2600,7 +2596,6 @@ static int init_jk(char *serverName)
uw_map->reject_unsafe = 1;
else
uw_map->reject_unsafe = 0;
- uw_map->collapse_slashes = collapse_slashes;
uw_map->reload = worker_mount_reload;
if (worker_mount_file[0]) {
uw_map->fname = worker_mount_file;
@@ -2730,17 +2725,6 @@ int parse_uri_select(const char *uri_sel
return -1;
}
-int parse_collapse_slashes(const char *collapse_slashes)
-{
- if (!strcasecmp(collapse_slashes, COLLAPSE_SLASHES_ALL_VERB))
- return JK_COLLAPSE_ALL;
- if (!strcasecmp(collapse_slashes, COLLAPSE_SLASHES_NONE_VERB))
- return JK_COLLAPSE_NONE;
- if (!strcasecmp(collapse_slashes, COLLAPSE_SLASHES_UNMOUNT_VERB))
- return JK_COLLAPSE_UNMOUNT;
- return -1;
-}
-
static int read_registry_init_data(void)
{
char tmpbuf[MAX_PATH];
@@ -2850,14 +2834,8 @@ static int read_registry_init_data(void)
}
}
if (get_config_parameter(src, COLLAPSE_SLASHES_TAG, tmpbuf,
sizeof(tmpbuf))) {
- int opt = parse_collapse_slashes(tmpbuf);
- if (opt >= 0) {
- collapse_slashes = opt;
- }
- else {
- jk_log(logger, JK_LOG_ERROR, "Invalid value '%s' for configuration
item '"
- COLLAPSE_SLASHES_TAG "'", tmpbuf);
- }
+ jk_log(logger, JK_LOG_ERROR, "Configuration item '"
COLLAPSE_SLASHES_TAG
+ "' is deprecated and will be ignored");
}
shm_config_size = get_config_int(src, SHM_SIZE_TAG, -1);
worker_mount_reload = get_config_int(src, WORKER_MOUNT_RELOAD_TAG,
JK_URIMAP_DEF_RELOAD);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
