Multiviews and mod_negotiation will already handle this case, it never

  belonged in mod_cgi itself.

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

diff --git a/CHANGES b/CHANGES
index be88dea07790c73f20b55e522aa957059b61bb3a..ba1c043fa51da5c9cedf4c1a0981b024e9085b9c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.23-dev
 
+  *) Eliminate mod_cgi's handling of .exe files without the .exe file
+     extension.  This is already handled by multiviews, if the admin
+     wishes to AddHandler .exe or define a content type handler and 
+     associate .exe files with that content type.  [William Rowe]
+
   *) Speed up the server's response to a spike in incoming workload
      or restarts by assigning empty scoreboard slots to new processes
      when they are available.  [Greg Ames]

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 91c977ba05ad590abfc8c6bd07672d2c02d97fb2..9e533113c70ee4d2611681faab35c8bb51821594 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -605,31 +605,9 @@ static int cgi_handler(request_rec *r)
         return log_scripterror(r, conf, HTTP_FORBIDDEN, 0,
                                "attempt to include NPH CGI script");
 
-#if defined(OS2) || defined(WIN32)
-    /* XXX: This is wrong.  As an option, perhaps, but not by default...
-     *      we are back to the same argument that a url should be a unique
-     *      entity until the sysadmin overrides that behavior.
-     * Allow for cgi files without the .EXE extension on them under OS/2 
-     */
-    if (r->finfo.filetype == 0) {
-        apr_finfo_t finfo;
-        char *newfile;
-        apr_status_t rv;
-
-        newfile = apr_pstrcat(r->pool, r->filename, ".EXE", NULL);
-        if (((rv = apr_stat(&finfo, newfile, APR_FINFO_TYPE, r->pool))
-                != APR_SUCCESS) || (finfo.filetype != APR_REG)) {
-            return log_scripterror(r, conf, HTTP_NOT_FOUND, rv,
-                                   "script not found or unable to stat");
-        } else {
-            r->filename = newfile;
-        }
-    }
-#else
     if (r->finfo.filetype == 0)
        return log_scripterror(r, conf, HTTP_NOT_FOUND, 0,
                               "script not found or unable to stat");
-#endif
     if (r->finfo.filetype == APR_DIR)
        return log_scripterror(r, conf, HTTP_FORBIDDEN, 0,
                               "attempt to invoke directory as script");