Negotiation once allowed any file, of any filename extension, to be

  served.  The original patch to mod_negotation eliminated all extensions
  that did not reflect filename extensions associated with negotiation
  variables, unless the user expressly specified the file name with those
  filename extensions.

  This patch [attributed to me] was vetoed at its inception, it was provided
  as an alternative for those who had to have the current behavior.

  There is now another alternative patch that would introduce the
  MultiviewsMatch directive to mod_mime, for consideration and discussion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91405 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index ade9ea2d16afb93a8189283975be98d4cdfbdfba..99cd29a8535f701177bbe4c20f10512d50f499c3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                             -*-text-*-
-Last modified at [$Date: 2001/10/09 19:29:19 $]
+Last modified at [$Date: 2001/10/10 19:43:37 $]
 
 Release:
 
@@ -34,14 +34,6 @@ on related projects:
 
 RELEASE SHOWSTOPPERS:
 
-    * Handler and Filter filetypes in mod_mime now trigger mod_negotiation 
-      recognition of files, but no mechanism exists to prioritize which of
-      several mod_negotation files ought to be served by handler or filter.
-      There needs to be a mechanism, or the change to reenable this match
-      behavior must be reverted [OtherBill's veto of 1.3 behavior].
-    
-      gregames says:  why is this a showstopper?  
-
     * If any request gets to the core handler, without a flag that this 
       r->filename was tested by dir/file_walk, we need to 500 at the very 
       end of the ap_process_request_internal() processing.  This provides

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 5a973e1f7a7d08e0811911cc4a6ad39c2b6470b7..9f5fa873be3382bcec778e026d53b102177cd6b1 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -780,7 +780,6 @@ static int find_ct(request_rec *r)
              */
             if (exinfo->handler && r->proxyreq == PROXYREQ_NONE) {
                 r->handler = exinfo->handler;
-                found = 1;
             }
             /* XXX Two significant problems; 1, we don't check to see if we are
              * setting redundant filters.    2, we insert these in the types config
@@ -792,7 +791,6 @@ static int find_ct(request_rec *r)
                     && (filter = ap_getword(r->pool, &filters, ';'))) {
                     ap_add_input_filter(filter, NULL, r, r->connection);
                 }
-                found = 1;
             }
             if (exinfo->output_filters && r->proxyreq == PROXYREQ_NONE) {
                 const char *filter, *filters = exinfo->output_filters;
@@ -800,7 +798,6 @@ static int find_ct(request_rec *r)
                     && (filter = ap_getword(r->pool, &filters, ';'))) {
                     ap_add_output_filter(filter, NULL, r, r->connection);
                 }
-                found = 1;
             }
         }