diff options
| author | Sascha Schumann <sas@php.net> | 2000-08-14 19:26:09 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-08-14 19:26:09 +0000 |
| commit | 744dce0da09c9eac7d2eb4926552cda007e1d658 (patch) | |
| tree | 130be78e6032674adcbab251b1b88ba083143ad4 /ext/mcrypt/mcrypt.c | |
| parent | e46ea8864c3c2548010128b22c26382d9aafbd98 (diff) | |
| download | php-git-744dce0da09c9eac7d2eb4926552cda007e1d658.tar.gz | |
Restrict INI entries when compiling against libmcrypt 2.4.
Diffstat (limited to 'ext/mcrypt/mcrypt.c')
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 1e13122f68..e5bf305475 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -237,14 +237,16 @@ ZEND_GET_MODULE(mcrypt) #define MCRYPT_ENTRY2_4(a) MCRYPT_ENTRY_NAMED(a, a) #endif +#if HAVE_LIBMCRYPT24 PHP_INI_BEGIN() STD_PHP_INI_ENTRY("mcrypt.algorithms_dir", NULL, PHP_INI_ALL, OnUpdateString, algorithms_dir, zend_mcrypt_globals, mcrypt_globals) STD_PHP_INI_ENTRY("mcrypt.modes_dir", NULL, PHP_INI_ALL, OnUpdateString, modes_dir, zend_mcrypt_globals, mcrypt_globals) PHP_INI_END() +#endif static PHP_MINIT_FUNCTION(mcrypt) { -#ifdef ZTS +#if defined(ZTS) && defined(HAVE_LIBMCRYPT24) ZEND_INIT_MODULE_GLOBALS(mcrypt, NULL, NULL); mcrypt_module_entry.type = type; #endif @@ -329,8 +331,8 @@ static PHP_MINIT_FUNCTION(mcrypt) MCRYPT_ENTRY2_2_4(MODE_NOFB, "nofb"); MCRYPT_ENTRY2_2_4(MODE_OFB, "ofb"); MCRYPT_ENTRY2_2_4(MODE_STREAM, "stream"); -#endif REGISTER_INI_ENTRIES(); +#endif return SUCCESS; } |