diff options
Diffstat (limited to 'src/sp_session.c')
| -rw-r--r-- | src/sp_session.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/sp_session.c b/src/sp_session.c index 214aa85..6335838 100644 --- a/src/sp_session.c +++ b/src/sp_session.c | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | #include "php_snuffleupagus.h" | 1 | #include "php_snuffleupagus.h" |
| 2 | 2 | ||
| 3 | #if (HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)) | ||
| 4 | |||
| 5 | #ifdef ZTS | 3 | #ifdef ZTS |
| 6 | static ts_rsrc_id session_globals_id = 0; | 4 | static ts_rsrc_id session_globals_id = 0; |
| 7 | #define SESSION_G(v) ZEND_TSRMG(session_globals_id, php_ps_globals *, v) | 5 | #define SESSION_G(v) ZEND_TSRMG(session_globals_id, php_ps_globals *, v) |
| @@ -10,7 +8,7 @@ ZEND_TSRMLS_CACHE_EXTERN(); | |||
| 10 | #endif | 8 | #endif |
| 11 | #else | 9 | #else |
| 12 | static php_ps_globals *session_globals = NULL; | 10 | static php_ps_globals *session_globals = NULL; |
| 13 | #define SESSION_G(v) (ps_globals.v) | 11 | #define SESSION_G(v) (session_globals->v) |
| 14 | #endif | 12 | #endif |
| 15 | 13 | ||
| 16 | static ps_module *s_module; | 14 | static ps_module *s_module; |
| @@ -138,6 +136,7 @@ void hook_session() { | |||
| 138 | zend_module_entry *module; | 136 | zend_module_entry *module; |
| 139 | 137 | ||
| 140 | if ((module = zend_hash_str_find_ptr(&module_registry, ZEND_STRL("session"))) == NULL) { | 138 | if ((module = zend_hash_str_find_ptr(&module_registry, ZEND_STRL("session"))) == NULL) { |
| 139 | sp_log_err("session", "You are trying to use session encryption or session ID restrictions, but your PHP installation has no session support. Please install the PHP session module or recompile PHP with session support."); | ||
| 141 | return; // LCOV_EXCL_LINE | 140 | return; // LCOV_EXCL_LINE |
| 142 | } | 141 | } |
| 143 | 142 | ||
| @@ -166,9 +165,3 @@ void hook_session() { | |||
| 166 | 165 | ||
| 167 | sp_hook_session_module(); | 166 | sp_hook_session_module(); |
| 168 | } | 167 | } |
| 169 | |||
| 170 | #else | ||
| 171 | |||
| 172 | void hook_session() {} | ||
| 173 | |||
| 174 | #endif // HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) | ||
