You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/08/06 06:47:12 UTC
cvs commit: httpd-2.0/modules/generators mod_cgi.c
wrowe 01/08/05 21:47:12
Modified: . CHANGES
modules/generators mod_cgi.c
Log:
Multiviews and mod_negotiation will already handle this case, it never
belonged in mod_cgi itself.
Revision Changes Path
1.274 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- CHANGES 2001/08/05 18:08:49 1.273
+++ CHANGES 2001/08/06 04:47:12 1.274
@@ -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]
1.96 +0 -22 httpd-2.0/modules/generators/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- mod_cgi.c 2001/07/30 16:18:05 1.95
+++ mod_cgi.c 2001/08/06 04:47:12 1.96
@@ -605,31 +605,9 @@
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");