diff options
| author | Shane Caraveo <shane@php.net> | 2002-10-13 08:38:09 +0000 |
|---|---|---|
| committer | Shane Caraveo <shane@php.net> | 2002-10-13 08:38:09 +0000 |
| commit | 96b9c0a52321ea8974f051a83cf58bb7ec6144d9 (patch) | |
| tree | 60116de08908d00f2f2cc556779739de8c6a7026 | |
| parent | acb9bc95e386f36c8c0e8a7b39f63ec1b45f0132 (diff) | |
| download | php-git-96b9c0a52321ea8974f051a83cf58bb7ec6144d9.tar.gz | |
make php_import_environment_variables overwritable so fastcgi can correctly
set $_ENV.
| -rw-r--r-- | main/php_variables.c | 6 | ||||
| -rw-r--r-- | main/php_variables.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 6f6bd6e206..73e19a856a 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -28,6 +28,9 @@ #include "zend_globals.h" +/* for systems that need to override reading of environment variables */ +void _php_import_environment_variables(zval *array_ptr TSRMLS_DC); +PHPAPI void (*php_import_environment_variables)(zval *array_ptr TSRMLS_DC) = _php_import_environment_variables; PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array TSRMLS_DC) { @@ -318,8 +321,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } } - -void php_import_environment_variables(zval *array_ptr TSRMLS_DC) +void _php_import_environment_variables(zval *array_ptr TSRMLS_DC) { char **env, *p, *t; diff --git a/main/php_variables.h b/main/php_variables.h index 8321c57d1c..38d3d3ec44 100644 --- a/main/php_variables.h +++ b/main/php_variables.h @@ -31,7 +31,7 @@ #define PARSE_STRING 3 void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC); -PHPAPI void php_import_environment_variables(zval *array_ptr TSRMLS_DC); +extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr TSRMLS_DC); PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array TSRMLS_DC); /* binary-safe version */ PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval *track_vars_array TSRMLS_DC); |