diff options
Diffstat (limited to 'ext/session/php_session.h')
| -rw-r--r-- | ext/session/php_session.h | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/ext/session/php_session.h b/ext/session/php_session.h index 9fb6477056..f47938cab5 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -32,13 +32,13 @@ /* To check php_session_valid_key()/php_session_reset_id() */ #define PHP_SESSION_STRICT 1 -#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name TSRMLS_DC -#define PS_CLOSE_ARGS void **mod_data TSRMLS_DC -#define PS_READ_ARGS void **mod_data, zend_string *key, zend_string **val TSRMLS_DC -#define PS_WRITE_ARGS void **mod_data, zend_string *key, zend_string *val TSRMLS_DC -#define PS_DESTROY_ARGS void **mod_data, zend_string *key TSRMLS_DC -#define PS_GC_ARGS void **mod_data, int maxlifetime, int *nrdels TSRMLS_DC -#define PS_CREATE_SID_ARGS void **mod_data TSRMLS_DC +#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name +#define PS_CLOSE_ARGS void **mod_data +#define PS_READ_ARGS void **mod_data, zend_string *key, zend_string **val +#define PS_WRITE_ARGS void **mod_data, zend_string *key, zend_string *val +#define PS_DESTROY_ARGS void **mod_data, zend_string *key +#define PS_GC_ARGS void **mod_data, int maxlifetime, int *nrdels +#define PS_CREATE_SID_ARGS void **mod_data /* default create id function */ PHPAPI zend_string *php_session_create_id(PS_CREATE_SID_ARGS); @@ -189,13 +189,16 @@ extern zend_module_entry session_module_entry; #define phpext_session_ptr &session_module_entry #ifdef ZTS -#define PS(v) TSRMG(ps_globals_id, php_ps_globals *, v) +#define PS(v) ZEND_TSRMG(ps_globals_id, php_ps_globals *, v) +#ifdef COMPILE_DL_SESSION +ZEND_TSRMLS_CACHE_EXTERN; +#endif #else #define PS(v) (ps_globals.v) #endif -#define PS_SERIALIZER_ENCODE_ARGS TSRMLS_D -#define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen TSRMLS_DC +#define PS_SERIALIZER_ENCODE_ARGS void +#define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen typedef struct ps_serializer_struct { const char *name; @@ -218,11 +221,11 @@ typedef struct ps_serializer_struct { #define PS_SERIALIZER_ENTRY(x) \ { #x, PS_SERIALIZER_ENCODE_NAME(x), PS_SERIALIZER_DECODE_NAME(x) } -PHPAPI void session_adapt_url(const char *, size_t, char **, size_t * TSRMLS_DC); +PHPAPI void session_adapt_url(const char *, size_t, char **, size_t *); -PHPAPI void php_add_session_var(zend_string *name TSRMLS_DC); -PHPAPI zval *php_set_session_var(zend_string *name, zval *state_val, php_unserialize_data_t *var_hash TSRMLS_DC); -PHPAPI zval *php_get_session_var(zend_string *name TSRMLS_DC); +PHPAPI void php_add_session_var(zend_string *name); +PHPAPI zval *php_set_session_var(zend_string *name, zval *state_val, php_unserialize_data_t *var_hash); +PHPAPI zval *php_get_session_var(zend_string *name); PHPAPI int php_session_register_module(ps_module *); @@ -230,17 +233,17 @@ PHPAPI int php_session_register_serializer(const char *name, zend_string *(*encode)(PS_SERIALIZER_ENCODE_ARGS), int (*decode)(PS_SERIALIZER_DECODE_ARGS)); -PHPAPI void php_session_set_id(char *id TSRMLS_DC); -PHPAPI void php_session_start(TSRMLS_D); +PHPAPI void php_session_set_id(char *id); +PHPAPI void php_session_start(void); -PHPAPI ps_module *_php_find_ps_module(char *name TSRMLS_DC); -PHPAPI const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC); +PHPAPI ps_module *_php_find_ps_module(char *name); +PHPAPI const ps_serializer *_php_find_ps_serializer(char *name); PHPAPI int php_session_valid_key(const char *key); -PHPAPI void php_session_reset_id(TSRMLS_D); +PHPAPI void php_session_reset_id(void); #define PS_ADD_VARL(name) do { \ - php_add_session_var(name TSRMLS_CC); \ + php_add_session_var(name); \ } while (0) #define PS_ADD_VAR(name) PS_ADD_VARL(name) @@ -261,11 +264,11 @@ PHPAPI void php_session_reset_id(TSRMLS_D); HashTable *_ht = Z_ARRVAL_P(Z_REFVAL(PS(http_session_vars))); \ ZEND_HASH_FOREACH_KEY(_ht, num_key, key) { \ if (key == NULL) { \ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, \ + php_error_docref(NULL, E_NOTICE, \ "Skipping numeric key %pd", num_key); \ continue; \ } \ - if ((struc = php_get_session_var(key TSRMLS_CC))) { \ + if ((struc = php_get_session_var(key))) { \ code; \ } \ } ZEND_HASH_FOREACH_END(); \ |