diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2007-09-28 20:57:11 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2007-09-28 20:57:11 +0000 |
| commit | 52cfb7d8946bb82cd2638e58a409834aee080f6f (patch) | |
| tree | 3b109e686db9d3e769fb696a7030a2fcae8dae1b /include | |
| parent | 7304ca69a27c59a3e3f158738e878192263a6354 (diff) | |
| download | apr-52cfb7d8946bb82cd2638e58a409834aee080f6f.tar.gz | |
Introduce APR_NO_FILE as an option for any of the three stdio streams
to cause the specified streams to be closed to the child process,
when the caller has chosen that flag via apr_procattr_io_set().
This is the nonportable flavor targeting 1.2.12; unix 1.3.0 specific
commit to follow.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@580484 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr_thread_proc.h | 9 | ||||
| -rw-r--r-- | include/arch/win32/apr_arch_file_io.h | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/apr_thread_proc.h b/include/apr_thread_proc.h index c7930901b..5cdb59d42 100644 --- a/include/apr_thread_proc.h +++ b/include/apr_thread_proc.h @@ -87,6 +87,15 @@ typedef enum { /** @see apr_procattr_io_set */ #define APR_CHILD_BLOCK 4 +/** @see apr_procattr_io_set + * @note introduced strictly for Win32 to apr revision 1.2.12 (to restore + * the non-portable default behavior of 1.2.9 and prior versions on Win32). + * This becomes portable to all platforms effective revision 1.3.0, ensuring + * the standard files specified in the call to apr_procattr_io_set are not + * open in the created process (on Win32 as INVALID_HANDLE_VALUEs). + */ +#define APR_NO_FILE 8 + /** @see apr_procattr_limit_set */ #define APR_LIMIT_CPU 0 /** @see apr_procattr_limit_set */ diff --git a/include/arch/win32/apr_arch_file_io.h b/include/arch/win32/apr_arch_file_io.h index a0b4391f8..6807546bf 100644 --- a/include/arch/win32/apr_arch_file_io.h +++ b/include/arch/win32/apr_arch_file_io.h @@ -99,8 +99,12 @@ void *res_name_from_filename(const char *file, int global, apr_pool_t *pool); #define APR_OPENINFO 0x00100000 /* Open without READ or WRITE access */ #define APR_OPENLINK 0x00200000 /* Open a link itself, if supported */ #define APR_READCONTROL 0x00400000 /* Read the file's owner/perms */ -#define APR_WRITECONTROL 0x00800000 /* Modifythe file's owner/perms */ +#define APR_WRITECONTROL 0x00800000 /* Modify the file's owner/perms */ #define APR_WRITEATTRS 0x01000000 /* Modify the file's attributes */ +#define APR_STDIN_FLAG 0x02000000 /* Obtained via apr_file_open_stdin() */ +#define APR_STDOUT_FLAG 0x04000000 /* Obtained via apr_file_open_stdout() */ +#define APR_STDERR_FLAG 0x06000000 /* Obtained via apr_file_open_stderr() */ +#define APR_STD_FLAGS (APR_STDIN_FLAG | APR_STDOUT_FLAG | APR_STDERR_FLAG) /* Entries missing from the MSVC 5.0 Win32 SDK: */ |