summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2000-06-20 06:15:02 +0200
committerWilliam A. Rowe Jr <wrowe@apache.org>2000-06-20 06:15:02 +0200
commitad6759a65777387f4ecd8e794dc142ef5bfed10d (patch)
tree05508a9259e71ac7a93bef45c18be37c00b0d550 /include
parent This patch disallows bogus args to the ScriptInterpreterSource directive (diff)
downloadapache2-ad6759a65777387f4ecd8e794dc142ef5bfed10d.tar.xz
apache2-ad6759a65777387f4ecd8e794dc142ef5bfed10d.zip
This Win32 patch adds the key HKCR/filetype/shell/execcgi/command as the
preference over the HKCR/filetype/shell/open/command for registry-based script execution, allowing two behaviors to coexist peacefully (the pipe based console behavior and the Win32 shell behavior.) The new ScriptInterpreterSource registry-strict directive dismisses bth the HKCR/filetype/shell/open/command and the shebang processing for administrators who are interested in explicit authorization of file type execution allowed in the context of subscriber-created scripts. The net result: only HKCR/filetype/shell/execcgi/command processing is permitted. Docs to follow shortly. PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85625 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r--include/http_core.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/http_core.h b/include/http_core.h
index aa2852ecc8..e79e0e5121 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -162,8 +162,9 @@ API_EXPORT(const ap_array_header_t *) ap_requires (request_rec *);
*/
typedef enum { eFileTypeUNKNOWN, eFileTypeBIN, eFileTypeEXE16, eFileTypeEXE32,
eFileTypeSCRIPT } file_type_e;
-typedef enum { INTERPRETER_SOURCE_UNSET, INTERPRETER_SOURCE_REGISTRY,
- INTERPRETER_SOURCE_SHEBANG } interpreter_source_e;
+typedef enum { INTERPRETER_SOURCE_UNSET, INTERPRETER_SOURCE_REGISTRY_STRICT,
+ INTERPRETER_SOURCE_REGISTRY, INTERPRETER_SOURCE_SHEBANG
+ } interpreter_source_e;
API_EXPORT(file_type_e) ap_get_win32_interpreter(const request_rec *,
char **interpreter,
char **arguments);