Remove support for implicit mapping (rjung)

apache · Sep 6, 2023 · 0095b6c · 0095b6c
1 parent 97da2b1
commit 0095b6c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/native/apache-2.0/mod_jk.c b/native/apache-2.0/mod_jk.c
@@ -2819,17 +2819,6 @@ static int jk_handler(request_rec * r)
                 rconf->rule_extensions = e;
             }
         }
-        else if (worker_env.num_of_workers == 1) {
-          /** We have a single worker (the common case).
-              (lb is a bit special, it should count as a single worker but
-              I'm not sure how). We also have a manual config directive that
-              explicitly give control to us. */
-            worker_name = worker_env.worker_list[0];
-            if (JK_IS_DEBUG_LEVEL(l))
-                jk_log(l, JK_LOG_DEBUG,
-                       "Single worker (%s) configuration for %s",
-                       worker_name, r->uri);
-        }
         else {
             if (!xconf->uw_map) {
                 if (JK_IS_DEBUG_LEVEL(l))
@@ -2856,14 +2845,6 @@ static int jk_handler(request_rec * r)
                     r->uri = clean_uri;
                 }
             }
-
-            if (worker_name == NULL && worker_env.num_of_workers) {
-                worker_name = worker_env.worker_list[0];
-                if (JK_IS_DEBUG_LEVEL(l))
-                    jk_log(l, JK_LOG_DEBUG,
-                           "Using first worker (%s) from %d workers for %s",
-                           worker_name, worker_env.num_of_workers, r->uri);
-            }
         }
         if (worker_name)
             apr_table_setn(r->notes, JK_NOTE_WORKER_NAME, worker_name);

diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
@@ -68,6 +68,10 @@
         of module internal symbols led to crashes when conflicting with library
         symbols. Based on a patch provided by Josef Čejka. (rjung)
       </fix>
+      <fix>
+        Remove support for implicit mapping of requests to workers. All mappings
+        must now be explicit. (rjung) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="IIS">

diff --git a/xdocs/reference/apache.xml b/xdocs/reference/apache.xml
@@ -1099,9 +1099,7 @@ ways of defining the forwards, in general to mod_jk directives will win.
 </p>
 <p>
 <b>SetHandler jakarta-servlet</b> forces requests to be handled by mod_jk.
-If you neither specify any workers via JkMount and the related directives,
-not via the environment variable described below,
-the first worker in the list of all worker will be chosen. You can use SetHandler
+You can use SetHandler
 for example in Location blocks or with Apache 2.2 and later also in RewriteRule.
 </p>
 <p>