diff options
| author | Zeev Suraski <zeev@php.net> | 2001-01-02 22:49:31 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-01-02 22:49:31 +0000 |
| commit | bd0ac7fe14b6f2eb82a2e13a38c3eca5d4fe2e4f (patch) | |
| tree | ff521b5242f3800f3495220bfdf51f9cf35bbe20 /main/SAPI.h | |
| parent | 348f6c609c148c2c1f17669dad521fe04cd50a2a (diff) | |
| download | php-git-bd0ac7fe14b6f2eb82a2e13a38c3eca5d4fe2e4f.tar.gz | |
Many patches. I hope I remember them all:
- Make sapi_module available to external modules (PHPAPI)
- Make the php.ini path reported in phpinfo() always point to
real full path of the php.ini file
- Optimized the ISAPI module not to read unnecessary server
variables and read necessary variables at most once.
Diffstat (limited to 'main/SAPI.h')
| -rw-r--r-- | main/SAPI.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/SAPI.h b/main/SAPI.h index 9d7c70ac79..4e9ada0278 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -57,7 +57,7 @@ typedef struct _sapi_post_entry sapi_post_entry; typedef struct _sapi_module_struct sapi_module_struct; -extern sapi_module_struct sapi_module; /* true global */ +extern SAPI_API sapi_module_struct sapi_module; /* true global */ /* Some values in this structure needs to be filled in before * calling sapi_activate(). We WILL change the `char *' entries, @@ -188,6 +188,8 @@ struct _sapi_module_struct { void (*register_server_variables)(zval *track_vars_array ELS_DC SLS_DC PLS_DC); void (*log_message)(char *message); + char *php_ini_path_override; + void (*block_interruptions)(void); void (*unblock_interruptions)(void); @@ -222,7 +224,7 @@ struct _sapi_post_entry { SAPI_POST_READER_FUNC(sapi_read_standard_form_data); SAPI_POST_READER_FUNC(php_default_post_reader); -#define STANDARD_SAPI_MODULE_PROPERTIES NULL +#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL #endif /* SAPI_H */ |