diff options
| author | Jani Taskinen <jani@php.net> | 2008-08-06 05:53:31 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2008-08-06 05:53:31 +0000 |
| commit | 525f3c4793a6026cc314a706ff68e18d9bba5b24 (patch) | |
| tree | 824d563c00cd7abe6e8355ff36fd0f9f03dc604d /ext/session/php_session.h | |
| parent | 5e06d51ea211b5636d86732d82d711c41dbc1e57 (diff) | |
| download | php-git-525f3c4793a6026cc314a706ff68e18d9bba5b24.tar.gz | |
MFH: General sync. WS / CS / etc. crap some people didn't bother to merge
MFH: before this commit..bunnies thank you all..
[DOC] - Added ext/hash support to ext/session's ID generator. (Sara)
[DOC] Ask Sara for explanation..
Diffstat (limited to 'ext/session/php_session.h')
| -rw-r--r-- | ext/session/php_session.h | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/ext/session/php_session.h b/ext/session/php_session.h index 08e44d58ed..0c79cd7074 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -23,6 +23,10 @@ #include "ext/standard/php_var.h" +#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH) +# include "ext/hash/php_hash.h" +#endif + #define PHP_SESSION_API 20020330 #define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name TSRMLS_DC @@ -134,6 +138,9 @@ typedef struct _php_ps_globals { zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */ long hash_func; +#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH) + php_hash_ops *hash_ops; +#endif long hash_bits_per_character; int send_cookie; int define_sid; @@ -145,26 +152,6 @@ typedef php_ps_globals zend_ps_globals; extern zend_module_entry session_module_entry; #define phpext_session_ptr &session_module_entry -PHP_FUNCTION(session_name); -PHP_FUNCTION(session_module_name); -PHP_FUNCTION(session_save_path); -PHP_FUNCTION(session_id); -PHP_FUNCTION(session_regenerate_id); -PHP_FUNCTION(session_decode); -PHP_FUNCTION(session_register); -PHP_FUNCTION(session_unregister); -PHP_FUNCTION(session_is_registered); -PHP_FUNCTION(session_encode); -PHP_FUNCTION(session_start); -PHP_FUNCTION(session_destroy); -PHP_FUNCTION(session_unset); -PHP_FUNCTION(session_set_save_handler); -PHP_FUNCTION(session_cache_expire); -PHP_FUNCTION(session_cache_limiter); -PHP_FUNCTION(session_set_cookie_params); -PHP_FUNCTION(session_get_cookie_params); -PHP_FUNCTION(session_write_close); - #ifdef ZTS #define PS(v) TSRMG(ps_globals_id, php_ps_globals *, v) #else |