/* {{{ session_functions[]
*/
function_entry session_functions[] = {
- PHP_FE(session_name, NULL)
- PHP_FE(session_module_name, NULL)
- PHP_FE(session_save_path, NULL)
- PHP_FE(session_id, NULL)
- PHP_FE(session_decode, NULL)
- PHP_FE(session_register, NULL)
- PHP_FE(session_unregister, NULL)
- PHP_FE(session_is_registered, NULL)
- PHP_FE(session_encode, NULL)
- PHP_FE(session_start, NULL)
- PHP_FE(session_destroy, NULL)
- PHP_FE(session_unset, NULL)
- PHP_FE(session_set_save_handler, NULL)
- PHP_FE(session_cache_limiter, NULL)
- PHP_FE(session_cache_expire, NULL)
- PHP_FE(session_set_cookie_params, NULL)
- PHP_FE(session_get_cookie_params, NULL)
- PHP_FE(session_write_close, NULL)
- {NULL, NULL, NULL}
+ PHP_FE(session_name, NULL)
+ PHP_FE(session_module_name, NULL)
+ PHP_FE(session_save_path, NULL)
+ PHP_FE(session_id, NULL)
+ PHP_FE(session_decode, NULL)
+ PHP_FE(session_register, NULL)
+ PHP_FE(session_unregister, NULL)
+ PHP_FE(session_is_registered, NULL)
+ PHP_FE(session_encode, NULL)
+ PHP_FE(session_start, NULL)
+ PHP_FE(session_destroy, NULL)
+ PHP_FE(session_unset, NULL)
+ PHP_FE(session_set_save_handler, NULL)
+ PHP_FE(session_cache_limiter, NULL)
+ PHP_FE(session_cache_expire, NULL)
+ PHP_FE(session_set_cookie_params, NULL)
+ PHP_FE(session_get_cookie_params, NULL)
+ PHP_FE(session_write_close, NULL)
+ {NULL, NULL, NULL}
};
/* }}} */
static ps_module *_php_find_ps_module(char *name TSRMLS_DC);
static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC);
-
static PHP_INI_MH(OnUpdateSaveHandler)
{
- PS(mod) = _php_find_ps_module(new_value TSRMLS_CC);
+ PS(mod) = _php_find_ps_module(new_value TSRMLS_CC);
/* Following lines are commented out to prevent bogus error message at
- start up. i.e. Save handler modules are not initialized before Session
+ start up. i.e. Save handler modules are not initilzied before Session
module. */
-/* if(!PS(mod)) { */
-/* php_error(E_ERROR,"Cannot find save handler %s",new_value); */
-/* } */
- return SUCCESS;
+/* if(!PS(mod)) { */
+/* php_error(E_ERROR,"Cannot find save handler %s",new_value); */
+/* } */
+ return SUCCESS;
}
static PHP_INI_MH(OnUpdateSerializer)
{
- PS(serializer) = _php_find_ps_serializer(new_value TSRMLS_CC);
+ PS(serializer) = _php_find_ps_serializer(new_value TSRMLS_CC);
/* Following lines are commented out to prevent bogus error message at
start up. i.e. Serializer modules are not initilzied before Session
module. */
-/* if(!PS(serializer)) { */
-/* php_error(E_ERROR,"Cannot find serialization handler %s",new_value); */
-/* } */
- return SUCCESS;
+/* if(!PS(serializer)) { */
+/* php_error(E_ERROR,"Cannot find serialization handler %s",new_value); */
+/* } */
+ return SUCCESS;
}
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("session.save_path", "", PHP_INI_ALL, OnUpdateString, save_path, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.name", "PHPSESSID", PHP_INI_ALL, OnUpdateString, session_name, php_ps_globals, ps_globals)
- PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL, OnUpdateSaveHandler)
- STD_PHP_INI_BOOLEAN("session.auto_start", "0", PHP_INI_ALL, OnUpdateBool, auto_start, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.gc_probability", "1", PHP_INI_ALL, OnUpdateInt, gc_probability, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL, OnUpdateInt, gc_maxlifetime, php_ps_globals, ps_globals)
- PHP_INI_ENTRY("session.serialize_handler", "php", PHP_INI_ALL, OnUpdateSerializer)
- STD_PHP_INI_ENTRY("session.cookie_lifetime", "0", PHP_INI_ALL, OnUpdateInt, cookie_lifetime, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.cookie_path", "/", PHP_INI_ALL, OnUpdateString, cookie_path, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.cookie_domain", "", PHP_INI_ALL, OnUpdateString, cookie_domain, php_ps_globals, ps_globals)
- STD_PHP_INI_BOOLEAN("session.cookie_secure", "", PHP_INI_ALL, OnUpdateBool, cookie_secure, php_ps_globals, ps_globals)
- STD_PHP_INI_BOOLEAN("session.use_cookies", "1", PHP_INI_ALL, OnUpdateBool, use_cookies, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.referer_check", "", PHP_INI_ALL, OnUpdateString, extern_referer_chk, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.entropy_file", "", PHP_INI_ALL, OnUpdateString, entropy_file, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.entropy_length", "0", PHP_INI_ALL, OnUpdateInt, entropy_length, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.cache_limiter", "nocache", PHP_INI_ALL, OnUpdateString, cache_limiter, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.cache_expire", "180", PHP_INI_ALL, OnUpdateInt, cache_expire, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.use_trans_sid", "1", PHP_INI_ALL, OnUpdateBool, use_trans_sid, php_ps_globals, ps_globals)
- /* Commented out until future discussion */
- /* PHP_INI_ENTRY("session.encode_sources", "globals,track", PHP_INI_ALL, NULL) */
+ STD_PHP_INI_ENTRY("session.save_path", "/tmp", PHP_INI_ALL, OnUpdateString, save_path, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.name", "PHPSESSID", PHP_INI_ALL, OnUpdateString, session_name, php_ps_globals, ps_globals)
+ PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL, OnUpdateSaveHandler)
+ STD_PHP_INI_BOOLEAN("session.auto_start", "0", PHP_INI_ALL, OnUpdateBool, auto_start, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.gc_probability", "1", PHP_INI_ALL, OnUpdateInt, gc_probability, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL, OnUpdateInt, gc_maxlifetime, php_ps_globals, ps_globals)
+ PHP_INI_ENTRY("session.serialize_handler", "php", PHP_INI_ALL, OnUpdateSerializer)
+ STD_PHP_INI_ENTRY("session.cookie_lifetime", "0", PHP_INI_ALL, OnUpdateInt, cookie_lifetime, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.cookie_path", "/", PHP_INI_ALL, OnUpdateString, cookie_path, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.cookie_domain", "", PHP_INI_ALL, OnUpdateString, cookie_domain, php_ps_globals, ps_globals)
+ STD_PHP_INI_BOOLEAN("session.cookie_secure", "", PHP_INI_ALL, OnUpdateBool, cookie_secure, php_ps_globals, ps_globals)
+ STD_PHP_INI_BOOLEAN("session.use_cookies", "1", PHP_INI_ALL, OnUpdateBool, use_cookies, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.referer_check", "", PHP_INI_ALL, OnUpdateString, extern_referer_chk, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.entropy_file", "", PHP_INI_ALL, OnUpdateString, entropy_file, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.entropy_length", "0", PHP_INI_ALL, OnUpdateInt, entropy_length, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.cache_limiter", "nocache", PHP_INI_ALL, OnUpdateString, cache_limiter, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.cache_expire", "180", PHP_INI_ALL, OnUpdateInt, cache_expire, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.use_trans_sid", "1", PHP_INI_ALL, OnUpdateBool, use_trans_sid, php_ps_globals, ps_globals)
+ /* Commented out until future discussion */
+ /* PHP_INI_ENTRY("session.encode_sources", "globals,track", PHP_INI_ALL, NULL) */
PHP_INI_END()
/* }}} */
#define MAX_SERIALIZERS 10
static ps_serializer ps_serializers[MAX_SERIALIZERS + 1] = {
- PS_SERIALIZER_ENTRY(php),
- PS_SERIALIZER_ENTRY(php_binary)
+ PS_SERIALIZER_ENTRY(php),
+ PS_SERIALIZER_ENTRY(php_binary)
};
#define MAX_MODULES 10
static ps_module *ps_modules[MAX_MODULES + 1] = {
- ps_files_ptr,
- ps_user_ptr
+ ps_files_ptr,
+ ps_user_ptr
};
-PHPAPI int php_session_register_serializer(const char *name,
- int (*encode)(PS_SERIALIZER_ENCODE_ARGS),
- int (*decode)(PS_SERIALIZER_DECODE_ARGS))
+PHPAPI int php_session_register_serializer(const char *name,
+ int (*encode)(PS_SERIALIZER_ENCODE_ARGS),
+ int (*decode)(PS_SERIALIZER_DECODE_ARGS))
{
- int ret = -1;
- int i;
-
- for (i = 0; i < MAX_SERIALIZERS; i++) {
- if (ps_serializers[i].name == NULL) {
- ps_serializers[i].name = name;
- ps_serializers[i].encode = encode;
- ps_serializers[i].decode = decode;
- ps_serializers[i + 1].name = NULL;
- ret = 0;
- break;
- }
- }
-
- return ret;
+ int ret = -1;
+ int i;
+
+ for (i = 0; i < MAX_SERIALIZERS; i++) {
+ if (ps_serializers[i].name == NULL) {
+ ps_serializers[i].name = name;
+ ps_serializers[i].encode = encode;
+ ps_serializers[i].decode = decode;
+ ps_serializers[i + 1].name = NULL;
+ ret = 0;
+ break;
+ }
+ }
+
+ return ret;
}
PHPAPI int php_session_register_module(ps_module *ptr)
{
- int ret = -1;
- int i;
-
- for (i = 0; i < MAX_MODULES; i++) {
- if (!ps_modules[i]) {
- ps_modules[i] = ptr;
- ret = 0;
- break;
- }
- }
-
- return ret;
+ int ret = -1;
+ int i;
+
+ for (i = 0; i < MAX_MODULES; i++) {
+ if (!ps_modules[i]) {
+ ps_modules[i] = ptr;
+ ret = 0;
+ break;
+ }
+ }
+
+ return ret;
}
PHP_MINIT_FUNCTION(session);
static zend_bool php_session_destroy(TSRMLS_D);
zend_module_entry session_module_entry = {
- STANDARD_MODULE_HEADER,
- "session",
- session_functions,
- PHP_MINIT(session), PHP_MSHUTDOWN(session),
- PHP_RINIT(session), PHP_RSHUTDOWN(session),
- PHP_MINFO(session),
+ STANDARD_MODULE_HEADER,
+ "session",
+ session_functions,
+ PHP_MINIT(session), PHP_MSHUTDOWN(session),
+ PHP_RINIT(session), PHP_RSHUTDOWN(session),
+ PHP_MINFO(session),
NO_VERSION_YET,
- STANDARD_MODULE_PROPERTIES
+ STANDARD_MODULE_PROPERTIES
};
#ifdef COMPILE_DL_SESSION
#endif
typedef struct {
- char *name;
- void (*func)(TSRMLS_D);
+ char *name;
+ void (*func)(TSRMLS_D);
} php_session_cache_limiter_t;
#define CACHE_LIMITER_FUNC(name) static void _php_cache_limiter_##name(TSRMLS_D)
#define ADD_COOKIE(a) sapi_add_header(a, strlen(a), 1);
#define STR_CAT(P,S,I) {\
- zval *__p = (P);\
- size_t __l = (I);\
- ulong __i = Z_STRLEN_P(__p);\
- Z_STRLEN_P(__p) += __l;\
- Z_STRVAL_P(__p) = (char *)erealloc(Z_STRVAL_P(__p), Z_STRLEN_P(__p) + 1);\
- memcpy(Z_STRVAL_P(__p) + __i, (S), __l); \
- Z_STRVAL_P(__p)[Z_STRLEN_P(__p)] = '\0'; \
+ zval *__p = (P);\
+ size_t __l = (I);\
+ ulong __i = Z_STRLEN_P(__p);\
+ Z_STRLEN_P(__p) += __l;\
+ Z_STRVAL_P(__p) = (char *)erealloc(Z_STRVAL_P(__p), Z_STRLEN_P(__p) + 1);\
+ memcpy(Z_STRVAL_P(__p) + __i, (S), __l); \
+ Z_STRVAL_P(__p)[Z_STRLEN_P(__p)] = '\0'; \
}
#define MAX_STR 512
void php_set_session_var(char *name, size_t namelen, zval *state_val, php_unserialize_data_t *var_hash TSRMLS_DC)
{
- if (PG(register_globals)) {
- zval **old_symbol;
- if (zend_hash_find(&EG(symbol_table),name,namelen+1,(void *)&old_symbol) == SUCCESS) {
- /*
- There where old one, we need to replace it accurately.
- hash_update in zend_set_hash_symbol is not good, because
- it will leave referenced variables (such as local instances
- of a global variable) dangling.
-
- BTW: if you use register_globals references between
- session-vars won't work because of this very reason!
- */
-
-
- REPLACE_ZVAL_VALUE(old_symbol,state_val,1);
-
- /* the following line will muck with the reference-table used for
- * unserialisation
- */
-
- PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash,state_val,*old_symbol);
-
- zend_set_hash_symbol(*old_symbol, name, namelen, 1, 1, Z_ARRVAL_P(PS(http_session_vars)));
- } else {
- zend_set_hash_symbol(state_val, name, namelen, 1, 2, Z_ARRVAL_P(PS(http_session_vars)), &EG(symbol_table));
- }
- } else {
- zend_set_hash_symbol(state_val, name, namelen, 0, 1, Z_ARRVAL_P(PS(http_session_vars)));
- }
+ if (PG(register_globals)) {
+ zval **old_symbol;
+ if (zend_hash_find(&EG(symbol_table),name,namelen+1,(void *)&old_symbol) == SUCCESS) {
+ /*
+ There where old one, we need to replace it accurately.
+ hash_update in zend_set_hash_symbol is not good, because
+ it will leave referenced variables (such as local instances
+ of a global variable) dangling.
+
+ BTW: if you use register_globals references between
+ session-vars won't work because of this very reason!
+ */
+
+
+ REPLACE_ZVAL_VALUE(old_symbol,state_val,1);
+
+ /* the following line will muck with the reference-table used for
+ * unserialisation
+ */
+
+ PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash,state_val,*old_symbol);
+
+ zend_set_hash_symbol(*old_symbol, name, namelen, 1, 1, Z_ARRVAL_P(PS(http_session_vars)));
+ } else {
+ zend_set_hash_symbol(state_val, name, namelen, 1, 2, Z_ARRVAL_P(PS(http_session_vars)), &EG(symbol_table));
+ }
+ } else {
+ zend_set_hash_symbol(state_val, name, namelen, 0, 1, Z_ARRVAL_P(PS(http_session_vars)));
+ }
}
int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC)
{
- if (PS(http_session_vars)) {
- if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen+1, (void **) state_var)==SUCCESS) {
- return SUCCESS;
- }
- } else if (!PG(register_globals)) {
- /* register_globals is disabled, but we don't have http_session_vars */
- return HASH_KEY_NON_EXISTANT;
- }
- return zend_hash_find(&EG(symbol_table), name, namelen+1, (void **) state_var);
+ if (PS(http_session_vars)) {
+ if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen+1, (void **) state_var)==SUCCESS) {
+ return SUCCESS;
+ }
+ } else if (!PG(register_globals)) {
+ /* register_globals is disabled, but we don't have http_session_vars */
+ return HASH_KEY_NON_EXISTANT;
+ }
+ return zend_hash_find(&EG(symbol_table), name, namelen+1, (void **) state_var);
}
#define PS_BIN_NR_OF_BITS 8
PS_SERIALIZER_ENCODE_FUNC(php_binary)
{
- smart_str buf = {0};
- php_serialize_data_t var_hash;
- PS_ENCODE_VARS;
-
- PHP_VAR_SERIALIZE_INIT(var_hash);
-
- PS_ENCODE_LOOP(
- if (key_length > PS_BIN_MAX) continue;
- smart_str_appendc(&buf, (unsigned char) key_length);
- smart_str_appendl(&buf, key, key_length);
-
- php_var_serialize(&buf, struc, &var_hash TSRMLS_CC);
- } else {
- if (key_length > PS_BIN_MAX) continue;
- smart_str_appendc(&buf, (unsigned char) (key_length & PS_BIN_UNDEF));
- smart_str_appendl(&buf, key, key_length);
- );
-
- if (newlen) *newlen = buf.len;
- *newstr = buf.c;
- PHP_VAR_SERIALIZE_DESTROY(var_hash);
+ smart_str buf = {0};
+ php_serialize_data_t var_hash;
+ PS_ENCODE_VARS;
+
+ PHP_VAR_SERIALIZE_INIT(var_hash);
+
+ PS_ENCODE_LOOP(
+ if (key_length > PS_BIN_MAX) continue;
+ smart_str_appendc(&buf, (unsigned char) key_length);
+ smart_str_appendl(&buf, key, key_length);
+
+ php_var_serialize(&buf, struc, &var_hash TSRMLS_CC);
+ } else {
+ if (key_length > PS_BIN_MAX) continue;
+ smart_str_appendc(&buf, (unsigned char) (key_length & PS_BIN_UNDEF));
+ smart_str_appendl(&buf, key, key_length);
+ );
+
+ if (newlen) *newlen = buf.len;
+ *newstr = buf.c;
+ PHP_VAR_SERIALIZE_DESTROY(var_hash);
- return SUCCESS;
+ return SUCCESS;
}
PS_SERIALIZER_DECODE_FUNC(php_binary)
{
- const char *p;
- char *name;
- const char *endptr = val + vallen;
- zval *current;
- int namelen;
- int has_value;
- php_unserialize_data_t var_hash;
-
- PHP_VAR_UNSERIALIZE_INIT(var_hash);
-
- for (p = val; p < endptr; ) {
- namelen = *p & (~PS_BIN_UNDEF);
- has_value = *p & PS_BIN_UNDEF ? 0 : 1;
-
- name = estrndup(p + 1, namelen);
-
- p += namelen + 1;
-
- if (has_value) {
- MAKE_STD_ZVAL(current);
- if (php_var_unserialize(¤t, &p, endptr, &var_hash TSRMLS_CC)) {
- php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC);
- }
- zval_ptr_dtor(¤t);
- }
- PS_ADD_VARL(name, namelen);
- efree(name);
- }
-
- PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
-
- return SUCCESS;
+ const char *p;
+ char *name;
+ const char *endptr = val + vallen;
+ zval *current;
+ int namelen;
+ int has_value;
+ php_unserialize_data_t var_hash;
+
+ PHP_VAR_UNSERIALIZE_INIT(var_hash);
+
+ for (p = val; p < endptr; ) {
+ namelen = *p & (~PS_BIN_UNDEF);
+ has_value = *p & PS_BIN_UNDEF ? 0 : 1;
+
+ name = estrndup(p + 1, namelen);
+
+ p += namelen + 1;
+
+ if (has_value) {
+ MAKE_STD_ZVAL(current);
+ if (php_var_unserialize(¤t, &p, endptr, &var_hash TSRMLS_CC)) {
+ php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC);
+ }
+ zval_ptr_dtor(¤t);
+ }
+ PS_ADD_VARL(name, namelen);
+ efree(name);
+ }
+
+ PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
+
+ return SUCCESS;
}
#define PS_DELIMITER '|'
PS_SERIALIZER_ENCODE_FUNC(php)
{
- smart_str buf = {0};
- php_serialize_data_t var_hash;
- PS_ENCODE_VARS;
-
- PHP_VAR_SERIALIZE_INIT(var_hash);
-
- PS_ENCODE_LOOP(
- if (key_length + 1 > MAX_STR) continue;
- smart_str_appendl(&buf, key, (unsigned char) key_length);
- smart_str_appendc(&buf, PS_DELIMITER);
-
- php_var_serialize(&buf, struc, &var_hash TSRMLS_CC);
- } else {
- if (key_length + 2 > MAX_STR) continue;
- smart_str_appendc(&buf, PS_UNDEF_MARKER);
- smart_str_appendl(&buf, key, key_length);
- smart_str_appendc(&buf, PS_DELIMITER);
- );
-
- if (newlen) *newlen = buf.len;
- *newstr = buf.c;
-
- PHP_VAR_SERIALIZE_DESTROY(var_hash);
- return SUCCESS;
+ smart_str buf = {0};
+ php_serialize_data_t var_hash;
+ PS_ENCODE_VARS;
+
+ PHP_VAR_SERIALIZE_INIT(var_hash);
+
+ PS_ENCODE_LOOP(
+ if (key_length + 1 > MAX_STR) continue;
+ smart_str_appendl(&buf, key, (unsigned char) key_length);
+ smart_str_appendc(&buf, PS_DELIMITER);
+
+ php_var_serialize(&buf, struc, &var_hash TSRMLS_CC);
+ } else {
+ if (key_length + 2 > MAX_STR) continue;
+ smart_str_appendc(&buf, PS_UNDEF_MARKER);
+ smart_str_appendl(&buf, key, key_length);
+ smart_str_appendc(&buf, PS_DELIMITER);
+ );
+
+ if (newlen) *newlen = buf.len;
+ *newstr = buf.c;
+
+ PHP_VAR_SERIALIZE_DESTROY(var_hash);
+ return SUCCESS;
}
-PS_SERIALIZER_DECODE_FUNC(php)
+PS_SERIALIZER_DECODE_FUNC(php)
{
- const char *p, *q;
- char *name;
- const char *endptr = val + vallen;
- zval *current;
- int namelen;
- int has_value;
- php_unserialize_data_t var_hash;
-
- PHP_VAR_UNSERIALIZE_INIT(var_hash);
-
- p = val;
-
- while (p < endptr) {
- q = p;
- while (*q != PS_DELIMITER)
- if (++q >= endptr) goto break_outer_loop;
-
- if (p[0] == PS_UNDEF_MARKER) {
- p++;
- has_value = 0;
- } else {
- has_value = 1;
- }
-
- namelen = q - p;
- name = estrndup(p, namelen);
- q++;
-
- if (has_value) {
- MAKE_STD_ZVAL(current);
- if (php_var_unserialize(¤t, &q, endptr, &var_hash TSRMLS_CC)) {
- php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC);
- }
- zval_ptr_dtor(¤t);
- }
- PS_ADD_VARL(name, namelen);
- efree(name);
-
- p = q;
- }
+ const char *p, *q;
+ char *name;
+ const char *endptr = val + vallen;
+ zval *current;
+ int namelen;
+ int has_value;
+ php_unserialize_data_t var_hash;
+
+ PHP_VAR_UNSERIALIZE_INIT(var_hash);
+
+ p = val;
+
+ while (p < endptr) {
+ q = p;
+ while (*q != PS_DELIMITER)
+ if (++q >= endptr) goto break_outer_loop;
+
+ if (p[0] == PS_UNDEF_MARKER) {
+ p++;
+ has_value = 0;
+ } else {
+ has_value = 1;
+ }
+
+ namelen = q - p;
+ name = estrndup(p, namelen);
+ q++;
+
+ if (has_value) {
+ MAKE_STD_ZVAL(current);
+ if (php_var_unserialize(¤t, &q, endptr, &var_hash TSRMLS_CC)) {
+ php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC);
+ }
+ zval_ptr_dtor(¤t);
+ }
+ PS_ADD_VARL(name, namelen);
+ efree(name);
+
+ p = q;
+ }
break_outer_loop:
+
+ PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
- PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
-
- return SUCCESS;
+ return SUCCESS;
}
static void php_session_track_init(TSRMLS_D)
{
- zval **old_vars = NULL;
-
- if (zend_hash_find(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), (void **)&old_vars) == SUCCESS && Z_TYPE_PP(old_vars) == IS_ARRAY) {
- PS(http_session_vars) = *old_vars;
- zend_hash_clean(Z_ARRVAL_P(PS(http_session_vars)));
- } else {
- if(old_vars) {
- zend_hash_del(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"));
- zend_hash_del(&EG(symbol_table), "_SESSION", sizeof("_SESSION"));
- }
- MAKE_STD_ZVAL(PS(http_session_vars));
- array_init(PS(http_session_vars));
- PS(http_session_vars)->refcount = 2;
- PS(http_session_vars)->is_ref = 1;
- zend_hash_update(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), &PS(http_session_vars), sizeof(zval *), NULL);
- zend_hash_update(&EG(symbol_table), "_SESSION", sizeof("_SESSION"), &PS(http_session_vars), sizeof(zval *), NULL);
- }
+ zval **old_vars = NULL;
+
+ if (zend_hash_find(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), (void **)&old_vars) == SUCCESS && Z_TYPE_PP(old_vars) == IS_ARRAY) {
+ PS(http_session_vars) = *old_vars;
+ zend_hash_clean(Z_ARRVAL_P(PS(http_session_vars)));
+ } else {
+ if(old_vars) {
+ zend_hash_del(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"));
+ zend_hash_del(&EG(symbol_table), "_SESSION", sizeof("_SESSION"));
+ }
+ MAKE_STD_ZVAL(PS(http_session_vars));
+ array_init(PS(http_session_vars));
+ PS(http_session_vars)->refcount = 2;
+ PS(http_session_vars)->is_ref = 1;
+ zend_hash_update(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), &PS(http_session_vars), sizeof(zval *), NULL);
+ zend_hash_update(&EG(symbol_table), "_SESSION", sizeof("_SESSION"), &PS(http_session_vars), sizeof(zval *), NULL);
+ }
}
static char *php_session_encode(int *newlen TSRMLS_DC)
{
- char *ret = NULL;
+ char *ret = NULL;
- if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == FAILURE)
- ret = NULL;
+ if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == FAILURE)
+ ret = NULL;
- return ret;
+ return ret;
}
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
- if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
- php_session_destroy(TSRMLS_C);
- php_error(E_WARNING, "Failed to decode session object. Session has been destroyed.");
- }
+ if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
+ php_session_destroy(TSRMLS_C);
+ php_error(E_WARNING, "Failed to decode session object. Session has been destroyed.");
+ }
}
static char hexconvtab[] = "0123456789abcdef";
char *php_session_create_id(PS_CREATE_SID_ARGS)
{
- PHP_MD5_CTX context;
- unsigned char digest[16];
- char buf[256];
- struct timeval tv;
- int i;
- int j = 0;
- unsigned char c;
-
- gettimeofday(&tv, NULL);
- PHP_MD5Init(&context);
-
- sprintf(buf, "%ld%ld%0.8f", tv.tv_sec, tv.tv_usec, php_combined_lcg(TSRMLS_C) * 10);
- PHP_MD5Update(&context, buf, strlen(buf));
-
- if (PS(entropy_length) > 0) {
- int fd;
-
- fd = VCWD_OPEN(PS(entropy_file), O_RDONLY);
- if (fd >= 0) {
- unsigned char buf[2048];
- int n;
- int to_read = PS(entropy_length);
-
- while (to_read > 0) {
- n = read(fd, buf, MIN(to_read, sizeof(buf)));
- if (n <= 0) break;
- PHP_MD5Update(&context, buf, n);
- to_read -= n;
- }
- close(fd);
- }
- }
-
- PHP_MD5Final(digest, &context);
-
- for (i = 0; i < 16; i++) {
- c = digest[i];
- buf[j++] = hexconvtab[c >> 4];
- buf[j++] = hexconvtab[c & 15];
- }
- buf[j] = '\0';
-
- if (newlen)
- *newlen = j;
- return estrdup(buf);
-}
+ PHP_MD5_CTX context;
+ unsigned char digest[16];
+ char buf[256];
+ struct timeval tv;
+ int i;
+ int j = 0;
+ unsigned char c;
+
+ gettimeofday(&tv, NULL);
+ PHP_MD5Init(&context);
+
+ sprintf(buf, "%ld%ld%0.8f", tv.tv_sec, tv.tv_usec, php_combined_lcg(TSRMLS_C) * 10);
+ PHP_MD5Update(&context, buf, strlen(buf));
+
+ if (PS(entropy_length) > 0) {
+ int fd;
+
+ fd = VCWD_OPEN(PS(entropy_file), O_RDONLY);
+ if (fd >= 0) {
+ unsigned char buf[2048];
+ int n;
+ int to_read = PS(entropy_length);
+
+ while (to_read > 0) {
+ n = read(fd, buf, MIN(to_read, sizeof(buf)));
+ if (n <= 0) break;
+ PHP_MD5Update(&context, buf, n);
+ to_read -= n;
+ }
+ close(fd);
+ }
+ }
-extern const char* get_temporary_directory();
+ PHP_MD5Final(digest, &context);
+
+ for (i = 0; i < 16; i++) {
+ c = digest[i];
+ buf[j++] = hexconvtab[c >> 4];
+ buf[j++] = hexconvtab[c & 15];
+ }
+ buf[j] = '\0';
+
+ if (newlen)
+ *newlen = j;
+ return estrdup(buf);
+}
static void php_session_initialize(TSRMLS_D)
{
- char *val;
- int vallen;
-
- /* Check that we have a valid save_path and default if not. */
- if (!*(PS(save_path))) {
- const char* path = get_temporary_directory();
- zend_alter_ini_entry("session.save_path", sizeof("session.save_path"), (char*)path, strlen(path), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
- }
-
- /* Open session handler first */
- if (PS(mod)->open(&PS(mod_data), PS(save_path), PS(session_name) TSRMLS_CC) == FAILURE) {
- php_error(E_ERROR, "Failed to initialize session module");
- return;
- }
-
- /* If there is no ID, use session module to create one */
- if (!PS(id))
- PS(id) = PS(mod)->create_sid(&PS(mod_data), NULL TSRMLS_CC);
-
- /* Read data */
- /* Question: if you create a SID here, should you also try to read data?
- * I'm not sure, but while not doing so will remove one session operation
- * it could prove usefull for those sites which wish to have "default"
- * session information
- */
- php_session_track_init(TSRMLS_C);
- if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen TSRMLS_CC) == SUCCESS) {
- php_session_decode(val, vallen TSRMLS_CC);
- efree(val);
- }
+ char *val;
+ int vallen;
+
+ /* Open session handler first */
+ if (PS(mod)->open(&PS(mod_data), PS(save_path), PS(session_name) TSRMLS_CC) == FAILURE) {
+ php_error(E_ERROR, "Failed to initialize session module");
+ return;
+ }
+
+ /* If there is no ID, use session module to create one */
+ if (!PS(id))
+ PS(id) = PS(mod)->create_sid(&PS(mod_data), NULL TSRMLS_CC);
+
+ /* Read data */
+ /* Question: if you create a SID here, should you also try to read data?
+ * I'm not sure, but while not doing so will remove one session operation
+ * it could prove usefull for those sites which wish to have "default"
+ * session information
+ */
+ php_session_track_init(TSRMLS_C);
+ if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen TSRMLS_CC) == SUCCESS) {
+ php_session_decode(val, vallen TSRMLS_CC);
+ efree(val);
+ }
}
static void php_session_save_current_state(TSRMLS_D)
{
- char *val;
- int vallen;
- int ret = FAILURE;
- char *variable;
- uint variable_len;
- ulong num_key;
- HashPosition pos;
-
- if (!PG(register_globals) && !PS(http_session_vars)) {
- return;
- }
-
- if (PS(http_session_vars)) {
- for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(PS(http_session_vars)), &pos);
- zend_hash_get_current_key_ex(Z_ARRVAL_P(PS(http_session_vars)), &variable, &variable_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING;
- zend_hash_move_forward_ex(Z_ARRVAL_P(PS(http_session_vars)),&pos)) {
- PS_ADD_VARL(variable,variable_len-1);
- }
- }
-
- if (PS(mod_data)) {
- val = php_session_encode(&vallen TSRMLS_CC);
- if (val) {
- ret = PS(mod)->write(&PS(mod_data), PS(id), val, vallen TSRMLS_CC);
- efree(val);
- } else {
- ret = PS(mod)->write(&PS(mod_data), PS(id), "", 0 TSRMLS_CC);
- }
- }
-
- if (ret == FAILURE)
- php_error(E_WARNING, "Failed to write session data (%s). Please "
- "verify that the current setting of session.save_path "
- "is correct (%s)",
- PS(mod)->name,
- PS(save_path));
-
-
- if (PS(mod_data))
- PS(mod)->close(&PS(mod_data) TSRMLS_CC);
+ char *val;
+ int vallen;
+ int ret = FAILURE;
+ char *variable;
+ uint variable_len;
+ ulong num_key;
+ HashPosition pos;
+
+ if (!PG(register_globals) && !PS(http_session_vars)) {
+ return;
+ }
+
+ if (PS(http_session_vars)) {
+ for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(PS(http_session_vars)), &pos);
+ zend_hash_get_current_key_ex(Z_ARRVAL_P(PS(http_session_vars)), &variable, &variable_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING;
+ zend_hash_move_forward_ex(Z_ARRVAL_P(PS(http_session_vars)),&pos)) {
+ PS_ADD_VARL(variable,variable_len-1);
+ }
+ }
+
+ if (PS(mod_data)) {
+ val = php_session_encode(&vallen TSRMLS_CC);
+ if (val) {
+ ret = PS(mod)->write(&PS(mod_data), PS(id), val, vallen TSRMLS_CC);
+ efree(val);
+ } else {
+ ret = PS(mod)->write(&PS(mod_data), PS(id), "", 0 TSRMLS_CC);
+ }
+ }
+
+ if (ret == FAILURE)
+ php_error(E_WARNING, "Failed to write session data (%s). Please "
+ "verify that the current setting of session.save_path "
+ "is correct (%s)",
+ PS(mod)->name,
+ PS(save_path));
+
+
+ if (PS(mod_data))
+ PS(mod)->close(&PS(mod_data) TSRMLS_CC);
}
static char *month_names[] = {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
static char *week_days[] = {
- "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
+ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
};
static void strcpy_gmt(char *ubuf, time_t *when)
{
- char buf[MAX_STR];
- struct tm tm;
- int n;
-
- php_gmtime_r(when, &tm);
-
- /* we know all components, thus it is safe to use sprintf */
- n = sprintf(buf, "%s, %d %s %d %02d:%02d:%02d GMT",
- week_days[tm.tm_wday], tm.tm_mday,
- month_names[tm.tm_mon], tm.tm_year + 1900,
- tm.tm_hour, tm.tm_min,
- tm.tm_sec);
- memcpy(ubuf, buf, n);
- ubuf[n] = '\0';
+ char buf[MAX_STR];
+ struct tm tm;
+ int n;
+
+ php_gmtime_r(when, &tm);
+
+ /* we know all components, thus it is safe to use sprintf */
+ n = sprintf(buf, "%s, %d %s %d %02d:%02d:%02d GMT",
+ week_days[tm.tm_wday], tm.tm_mday,
+ month_names[tm.tm_mon], tm.tm_year + 1900,
+ tm.tm_hour, tm.tm_min,
+ tm.tm_sec);
+ memcpy(ubuf, buf, n);
+ ubuf[n] = '\0';
}
static void last_modified(TSRMLS_D)
{
- const char *path;
- struct stat sb;
- char buf[MAX_STR + 1];
-
- path = SG(request_info).path_translated;
- if (path) {
- if (VCWD_STAT(path, &sb) == -1) {
- return;
- }
+ const char *path;
+ struct stat sb;
+ char buf[MAX_STR + 1];
+
+ path = SG(request_info).path_translated;
+ if (path) {
+ if (VCWD_STAT(path, &sb) == -1) {
+ return;
+ }
#define LAST_MODIFIED "Last-Modified: "
- memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1);
- strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime);
- ADD_COOKIE(buf);
- }
+ memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1);
+ strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime);
+ ADD_COOKIE(buf);
+ }
}
CACHE_LIMITER_FUNC(public)
{
- char buf[MAX_STR + 1];
- struct timeval tv;
- time_t now;
-
- gettimeofday(&tv, NULL);
- now = tv.tv_sec + PS(cache_expire) * 60;
+ char buf[MAX_STR + 1];
+ struct timeval tv;
+ time_t now;
+
+ gettimeofday(&tv, NULL);
+ now = tv.tv_sec + PS(cache_expire) * 60;
#define EXPIRES "Expires: "
- memcpy(buf, EXPIRES, sizeof(EXPIRES) - 1);
- strcpy_gmt(buf + sizeof(EXPIRES) - 1, &now);
- ADD_COOKIE(buf);
-
- sprintf(buf, "Cache-Control: public, max-age=%ld", PS(cache_expire) * 60);
- ADD_COOKIE(buf);
-
- last_modified(TSRMLS_C);
+ memcpy(buf, EXPIRES, sizeof(EXPIRES) - 1);
+ strcpy_gmt(buf + sizeof(EXPIRES) - 1, &now);
+ ADD_COOKIE(buf);
+
+ sprintf(buf, "Cache-Control: public, max-age=%ld", PS(cache_expire) * 60);
+ ADD_COOKIE(buf);
+
+ last_modified(TSRMLS_C);
}
CACHE_LIMITER_FUNC(private)
{
- char buf[MAX_STR + 1];
-
- ADD_COOKIE("Expires: Thu, 19 Nov 1981 08:52:00 GMT");
- sprintf(buf, "Cache-Control: private, max-age=%ld, pre-check=%ld", PS(cache_expire) * 60, PS(cache_expire) * 60);
- ADD_COOKIE(buf);
+ char buf[MAX_STR + 1];
+
+ ADD_COOKIE("Expires: Thu, 19 Nov 1981 08:52:00 GMT");
+ sprintf(buf, "Cache-Control: private, max-age=%ld, pre-check=%ld", PS(cache_expire) * 60, PS(cache_expire) * 60);
+ ADD_COOKIE(buf);
- last_modified(TSRMLS_C);
+ last_modified(TSRMLS_C);
}
CACHE_LIMITER_FUNC(private_no_expire)
{
- char buf[MAX_STR + 1];
-
- sprintf(buf, "Cache-Control: private, max-age=%ld, pre-check=%ld", PS(cache_expire) * 60, PS(cache_expire) * 60);
- ADD_COOKIE(buf);
+ char buf[MAX_STR + 1];
+
+ sprintf(buf, "Cache-Control: private, max-age=%ld, pre-check=%ld", PS(cache_expire) * 60, PS(cache_expire) * 60);
+ ADD_COOKIE(buf);
- last_modified(TSRMLS_C);
+ last_modified(TSRMLS_C);
}
CACHE_LIMITER_FUNC(nocache)
{
- ADD_COOKIE("Expires: Thu, 19 Nov 1981 08:52:00 GMT");
- /* For HTTP/1.1 conforming clients and the rest (MSIE 5) */
- ADD_COOKIE("Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0");
- /* For HTTP/1.0 conforming clients */
- ADD_COOKIE("Pragma: no-cache");
+ ADD_COOKIE("Expires: Thu, 19 Nov 1981 08:52:00 GMT");
+ /* For HTTP/1.1 conforming clients and the rest (MSIE 5) */
+ ADD_COOKIE("Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0");
+ /* For HTTP/1.0 conforming clients */
+ ADD_COOKIE("Pragma: no-cache");
}
static php_session_cache_limiter_t php_session_cache_limiters[] = {
- CACHE_LIMITER(public)
- CACHE_LIMITER(private)
- CACHE_LIMITER(private_no_expire)
- CACHE_LIMITER(nocache)
- {0}
+ CACHE_LIMITER(public)
+ CACHE_LIMITER(private)
+ CACHE_LIMITER(private_no_expire)
+ CACHE_LIMITER(nocache)
+ {0}
};
static int php_session_cache_limiter(TSRMLS_D)
{
- php_session_cache_limiter_t *lim;
-
- if (SG(headers_sent)) {
- char *output_start_filename = php_get_output_start_filename(TSRMLS_C);
- int output_start_lineno = php_get_output_start_lineno(TSRMLS_C);
-
- if (output_start_filename) {
- php_error(E_WARNING, "Cannot send session cache limiter - headers already sent (output started at %s:%d)",
- output_start_filename, output_start_lineno);
- } else {
- php_error(E_WARNING, "Cannot send session cache limiter - headers already sent");
- }
- return (-2);
- }
-
- for (lim = php_session_cache_limiters; lim->name; lim++) {
- if (!strcasecmp(lim->name, PS(cache_limiter))) {
- lim->func(TSRMLS_C);
- return (0);
- }
- }
-
- return (-1);
+ php_session_cache_limiter_t *lim;
+
+ if (SG(headers_sent)) {
+ char *output_start_filename = php_get_output_start_filename(TSRMLS_C);
+ int output_start_lineno = php_get_output_start_lineno(TSRMLS_C);
+
+ if (output_start_filename) {
+ php_error(E_WARNING, "Cannot send session cache limiter - headers already sent (output started at %s:%d)",
+ output_start_filename, output_start_lineno);
+ } else {
+ php_error(E_WARNING, "Cannot send session cache limiter - headers already sent");
+ }
+ return (-2);
+ }
+
+ for (lim = php_session_cache_limiters; lim->name; lim++) {
+ if (!strcasecmp(lim->name, PS(cache_limiter))) {
+ lim->func(TSRMLS_C);
+ return (0);
+ }
+ }
+
+ return (-1);
}
#define COOKIE_SET_COOKIE "Set-Cookie: "
-#define COOKIE_EXPIRES "; expires="
-#define COOKIE_PATH "; path="
-#define COOKIE_DOMAIN "; domain="
-#define COOKIE_SECURE "; secure"
+#define COOKIE_EXPIRES "; expires="
+#define COOKIE_PATH "; path="
+#define COOKIE_DOMAIN "; domain="
+#define COOKIE_SECURE "; secure"
static void php_session_send_cookie(TSRMLS_D)
{
- smart_str ncookie = {0};
- char *date_fmt = NULL;
-
- if (SG(headers_sent)) {
- char *output_start_filename = php_get_output_start_filename(TSRMLS_C);
- int output_start_lineno = php_get_output_start_lineno(TSRMLS_C);
-
- if (output_start_filename) {
- php_error(E_WARNING, "Cannot send session cookie - headers already sent by (output started at %s:%d)",
- output_start_filename, output_start_lineno);
- } else {
- php_error(E_WARNING, "Cannot send session cookie - headers already sent");
- }
- return;
- }
-
- smart_str_appends(&ncookie, COOKIE_SET_COOKIE);
- smart_str_appends(&ncookie, PS(session_name));
- smart_str_appendc(&ncookie, '=');
- smart_str_appends(&ncookie, PS(id));
-
- if (PS(cookie_lifetime) > 0) {
- struct timeval tv;
-
- gettimeofday(&tv, NULL);
- date_fmt = php_std_date(tv.tv_sec + PS(cookie_lifetime));
-
- smart_str_appends(&ncookie, COOKIE_EXPIRES);
- smart_str_appends(&ncookie, date_fmt);
- efree(date_fmt);
- }
-
- if (PS(cookie_path)[0]) {
- smart_str_appends(&ncookie, COOKIE_PATH);
- smart_str_appends(&ncookie, PS(cookie_path));
- }
-
- if (PS(cookie_domain)[0]) {
- smart_str_appends(&ncookie, COOKIE_DOMAIN);
- smart_str_appends(&ncookie, PS(cookie_domain));
- }
-
- if (PS(cookie_secure)) {
- smart_str_appends(&ncookie, COOKIE_SECURE);
- }
-
- smart_str_0(&ncookie);
-
- sapi_add_header(ncookie.c, ncookie.len, 0);
+ smart_str ncookie = {0};
+ char *date_fmt = NULL;
+
+ if (SG(headers_sent)) {
+ char *output_start_filename = php_get_output_start_filename(TSRMLS_C);
+ int output_start_lineno = php_get_output_start_lineno(TSRMLS_C);
+
+ if (output_start_filename) {
+ php_error(E_WARNING, "Cannot send session cookie - headers already sent by (output started at %s:%d)",
+ output_start_filename, output_start_lineno);
+ } else {
+ php_error(E_WARNING, "Cannot send session cookie - headers already sent");
+ }
+ return;
+ }
+
+ smart_str_appends(&ncookie, COOKIE_SET_COOKIE);
+ smart_str_appends(&ncookie, PS(session_name));
+ smart_str_appendc(&ncookie, '=');
+ smart_str_appends(&ncookie, PS(id));
+
+ if (PS(cookie_lifetime) > 0) {
+ struct timeval tv;
+
+ gettimeofday(&tv, NULL);
+ date_fmt = php_std_date(tv.tv_sec + PS(cookie_lifetime));
+
+ smart_str_appends(&ncookie, COOKIE_EXPIRES);
+ smart_str_appends(&ncookie, date_fmt);
+ efree(date_fmt);
+ }
+
+ if (PS(cookie_path)[0]) {
+ smart_str_appends(&ncookie, COOKIE_PATH);
+ smart_str_appends(&ncookie, PS(cookie_path));
+ }
+
+ if (PS(cookie_domain)[0]) {
+ smart_str_appends(&ncookie, COOKIE_DOMAIN);
+ smart_str_appends(&ncookie, PS(cookie_domain));
+ }
+
+ if (PS(cookie_secure)) {
+ smart_str_appends(&ncookie, COOKIE_SECURE);
+ }
+
+ smart_str_0(&ncookie);
+
+ sapi_add_header(ncookie.c, ncookie.len, 0);
}
static ps_module *_php_find_ps_module(char *name TSRMLS_DC)
{
- ps_module *ret = NULL;
- ps_module **mod;
- int i;
-
- for (i = 0, mod = ps_modules; i < MAX_MODULES; i++, mod++)
- if (*mod && !strcasecmp(name, (*mod)->name)) {
- ret = *mod;
- break;
- }
-
- return ret;
+ ps_module *ret = NULL;
+ ps_module **mod;
+ int i;
+
+ for (i = 0, mod = ps_modules; i < MAX_MODULES; i++, mod++)
+ if (*mod && !strcasecmp(name, (*mod)->name)) {
+ ret = *mod;
+ break;
+ }
+
+ return ret;
}
static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC)
{
- const ps_serializer *ret = NULL;
- const ps_serializer *mod;
+ const ps_serializer *ret = NULL;
+ const ps_serializer *mod;
- for (mod = ps_serializers; mod->name; mod++)
- if (!strcasecmp(name, mod->name)) {
- ret = mod;
- break;
- }
+ for (mod = ps_serializers; mod->name; mod++)
+ if (!strcasecmp(name, mod->name)) {
+ ret = mod;
+ break;
+ }
- return ret;
+ return ret;
}
#define PPID2SID \
- convert_to_string((*ppid)); \
- PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid))
+ convert_to_string((*ppid)); \
+ PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid))
PHPAPI void php_session_start(TSRMLS_D)
{
- zval **ppid;
- zval **data;
- char *p;
- int send_cookie = 1;
- int define_sid = 1;
- int module_number = PS(module_number);
- int nrand;
- int lensess;
-
- PS(apply_trans_sid) = PS(use_trans_sid);
-
- if (PS(session_status) != php_session_none)
- return;
-
- lensess = strlen(PS(session_name));
-
-
- /*
- * Cookies are preferred, because initially
- * cookie and get variables will be available.
- */
-
- if (!PS(id)) {
- if (zend_hash_find(&EG(symbol_table), "_COOKIE",
- sizeof("_COOKIE"), (void **) &data) == SUCCESS &&
- Z_TYPE_PP(data) == IS_ARRAY &&
- zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
- lensess + 1, (void **) &ppid) == SUCCESS) {
- PPID2SID;
- PS(apply_trans_sid) = 0;
- send_cookie = 0;
- define_sid = 0;
- }
-
- if (!PS(id) &&
- zend_hash_find(&EG(symbol_table), "_GET",
- sizeof("_GET"), (void **) &data) == SUCCESS &&
- Z_TYPE_PP(data) == IS_ARRAY &&
- zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
- lensess + 1, (void **) &ppid) == SUCCESS) {
- PPID2SID;
- send_cookie = 0;
- }
-
- if (!PS(id) &&
- zend_hash_find(&EG(symbol_table), "_POST",
- sizeof("_POST"), (void **) &data) == SUCCESS &&
- Z_TYPE_PP(data) == IS_ARRAY &&
- zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
- lensess + 1, (void **) &ppid) == SUCCESS) {
- PPID2SID;
- send_cookie = 0;
- }
- }
-
- /* check the REQUEST_URI symbol for a string of the form
- '<session-name>=<session-id>' to allow URLs of the form
+ zval **ppid;
+ zval **data;
+ char *p;
+ int send_cookie = 1;
+ int define_sid = 1;
+ int module_number = PS(module_number);
+ int nrand;
+ int lensess;
+
+ PS(apply_trans_sid) = PS(use_trans_sid);
+
+ if (PS(session_status) != php_session_none)
+ return;
+
+ lensess = strlen(PS(session_name));
+
+
+ /*
+ * Cookies are preferred, because initially
+ * cookie and get variables will be available.
+ */
+
+ if (!PS(id)) {
+ if (zend_hash_find(&EG(symbol_table), "_COOKIE",
+ sizeof("_COOKIE"), (void **) &data) == SUCCESS &&
+ Z_TYPE_PP(data) == IS_ARRAY &&
+ zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
+ lensess + 1, (void **) &ppid) == SUCCESS) {
+ PPID2SID;
+ PS(apply_trans_sid) = 0;
+ send_cookie = 0;
+ define_sid = 0;
+ }
+
+ if (!PS(id) &&
+ zend_hash_find(&EG(symbol_table), "_GET",
+ sizeof("_GET"), (void **) &data) == SUCCESS &&
+ Z_TYPE_PP(data) == IS_ARRAY &&
+ zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
+ lensess + 1, (void **) &ppid) == SUCCESS) {
+ PPID2SID;
+ send_cookie = 0;
+ }
+
+ if (!PS(id) &&
+ zend_hash_find(&EG(symbol_table), "_POST",
+ sizeof("_POST"), (void **) &data) == SUCCESS &&
+ Z_TYPE_PP(data) == IS_ARRAY &&
+ zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
+ lensess + 1, (void **) &ppid) == SUCCESS) {
+ PPID2SID;
+ send_cookie = 0;
+ }
+ }
+
+ /* check the REQUEST_URI symbol for a string of the form
+ '<session-name>=<session-id>' to allow URLs of the form
http://yoursite/<session-name>=<session-id>/script.php */
if (!PS(id) &&
if (nrand < PS(gc_probability)) {
PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime), &nrdels TSRMLS_CC);
#if 0
- if (nrdels != -1)
- php_error(E_NOTICE, "purged %d expired session objects\n", nrdels);
+ if (nrdels != -1)
+ php_error(E_NOTICE, "purged %d expired session objects\n", nrdels);
#endif
- }
- }
+ }
+ }
}
static zend_bool php_session_destroy(TSRMLS_D)
{
- zend_bool retval = SUCCESS;
+ zend_bool retval = SUCCESS;
- if (PS(session_status) != php_session_active) {
- php_error(E_WARNING, "Trying to destroy uninitialized session");
- return FAILURE;
- }
-
- if (PS(mod)->destroy(&PS(mod_data), PS(id) TSRMLS_CC) == FAILURE) {
- retval = FAILURE;
- php_error(E_WARNING, "Session object destruction failed");
- }
+ if (PS(session_status) != php_session_active) {
+ php_error(E_WARNING, "Trying to destroy uninitialized session");
+ return FAILURE;
+ }
- php_rshutdown_session_globals(TSRMLS_C);
- php_rinit_session_globals(TSRMLS_C);
+ if (PS(mod)->destroy(&PS(mod_data), PS(id) TSRMLS_CC) == FAILURE) {
+ retval = FAILURE;
+ php_error(E_WARNING, "Session object destruction failed");
+ }
+
+ php_rshutdown_session_globals(TSRMLS_C);
+ php_rinit_session_globals(TSRMLS_C);
- return retval;
+ return retval;
}
{
zval **lifetime, **path, **domain, **secure;
- if (!PS(use_cookies))
- return;
+ if (!PS(use_cookies))
+ return;
if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 4 ||
- zend_get_parameters_ex(ZEND_NUM_ARGS(), &lifetime, &path, &domain, &secure) == FAILURE)
- WRONG_PARAM_COUNT;
-
- convert_to_long_ex(lifetime);
- PS(cookie_lifetime) = Z_LVAL_PP(lifetime);
-
- if (ZEND_NUM_ARGS() > 1) {
- convert_to_string_ex(path);
- zend_alter_ini_entry("session.cookie_path", sizeof("session.cookie_path"), Z_STRVAL_PP(path), Z_STRLEN_PP(path), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
-
- if (ZEND_NUM_ARGS() > 2) {
- convert_to_string_ex(domain);
- zend_alter_ini_entry("session.cookie_domain", sizeof("session.cookie_domain"), Z_STRVAL_PP(domain), Z_STRLEN_PP(domain), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
- if (ZEND_NUM_ARGS() > 3) {
- convert_to_long_ex(secure);
- zend_alter_ini_entry("session.cookie_secure", sizeof("session.cookie_secure"), Z_BVAL_PP(secure)?"1":"0", 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
- }
- }
- }
+ zend_get_parameters_ex(ZEND_NUM_ARGS(), &lifetime, &path, &domain, &secure) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ convert_to_long_ex(lifetime);
+ PS(cookie_lifetime) = Z_LVAL_PP(lifetime);
+
+ if (ZEND_NUM_ARGS() > 1) {
+ convert_to_string_ex(path);
+ zend_alter_ini_entry("session.cookie_path", sizeof("session.cookie_path"), Z_STRVAL_PP(path), Z_STRLEN_PP(path), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
+
+ if (ZEND_NUM_ARGS() > 2) {
+ convert_to_string_ex(domain);
+ zend_alter_ini_entry("session.cookie_domain", sizeof("session.cookie_domain"), Z_STRVAL_PP(domain), Z_STRLEN_PP(domain), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
+ if (ZEND_NUM_ARGS() > 3) {
+ convert_to_long_ex(secure);
+ zend_alter_ini_entry("session.cookie_secure", sizeof("session.cookie_secure"), Z_BVAL_PP(secure)?"1":"0", 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
+ }
+ }
+ }
}
/* }}} */
/* {{{ proto array session_get_cookie_params(void)
- Return the session cookie parameters */
+ Return the session cookie parameters */
PHP_FUNCTION(session_get_cookie_params)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
- }
-
- if (array_init(return_value) == FAILURE) {
- php_error(E_ERROR, "Cannot initialize return value from session_get_cookie_parameters");
- RETURN_FALSE;
- }
-
- add_assoc_long(return_value, "lifetime", PS(cookie_lifetime));
- add_assoc_string(return_value, "path", PS(cookie_path), 1);
- add_assoc_string(return_value, "domain", PS(cookie_domain), 1);
- add_assoc_bool(return_value, "secure", PS(cookie_secure));
+ if (ZEND_NUM_ARGS() != 0) {
+ WRONG_PARAM_COUNT;
+ }
+
+ if (array_init(return_value) == FAILURE) {
+ php_error(E_ERROR, "Cannot initialize return value from session_get_cookie_parameters");
+ RETURN_FALSE;
+ }
+
+ add_assoc_long(return_value, "lifetime", PS(cookie_lifetime));
+ add_assoc_string(return_value, "path", PS(cookie_path), 1);
+ add_assoc_string(return_value, "domain", PS(cookie_domain), 1);
+ add_assoc_bool(return_value, "secure", PS(cookie_secure));
}
/* }}} */
Return the current session name. If newname is given, the session name is replaced with newname */
PHP_FUNCTION(session_name)
{
- zval **p_name;
- int ac = ZEND_NUM_ARGS();
- char *old;
-
- if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
- WRONG_PARAM_COUNT;
+ zval **p_name;
+ int ac = ZEND_NUM_ARGS();
+ char *old;
- old = estrdup(PS(session_name));
-
- if (ac == 1) {
- convert_to_string_ex(p_name);
- zend_alter_ini_entry("session.name", sizeof("session.name"), Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
- }
+ if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ old = estrdup(PS(session_name));
- RETVAL_STRING(old, 0);
+ if (ac == 1) {
+ convert_to_string_ex(p_name);
+ zend_alter_ini_entry("session.name", sizeof("session.name"), Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
+ }
+
+ RETVAL_STRING(old, 0);
}
/* }}} */
Return the current module name used for accessing session data. If newname is given, the module name is replaced with newname */
PHP_FUNCTION(session_module_name)
{
- zval **p_name;
- int ac = ZEND_NUM_ARGS();
- char *old;
-
- if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
- WRONG_PARAM_COUNT;
-
- old = safe_estrdup(PS(mod)->name);
-
- if (ac == 1) {
- ps_module *tempmod;
-
- convert_to_string_ex(p_name);
- tempmod = _php_find_ps_module(Z_STRVAL_PP(p_name) TSRMLS_CC);
- if (tempmod) {
- if (PS(mod_data))
- PS(mod)->close(&PS(mod_data) TSRMLS_CC);
- PS(mod) = tempmod;
- PS(mod_data) = NULL;
- } else {
- efree(old);
- php_error(E_ERROR, "Cannot find named PHP session module (%s)",
- Z_STRVAL_PP(p_name));
- RETURN_FALSE;
- }
- }
-
- RETVAL_STRING(old, 0);
+ zval **p_name;
+ int ac = ZEND_NUM_ARGS();
+ char *old;
+
+ if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ old = safe_estrdup(PS(mod)->name);
+
+ if (ac == 1) {
+ ps_module *tempmod;
+
+ convert_to_string_ex(p_name);
+ tempmod = _php_find_ps_module(Z_STRVAL_PP(p_name) TSRMLS_CC);
+ if (tempmod) {
+ if (PS(mod_data))
+ PS(mod)->close(&PS(mod_data) TSRMLS_CC);
+ PS(mod) = tempmod;
+ PS(mod_data) = NULL;
+ } else {
+ efree(old);
+ php_error(E_ERROR, "Cannot find named PHP session module (%s)",
+ Z_STRVAL_PP(p_name));
+ RETURN_FALSE;
+ }
+ }
+
+ RETVAL_STRING(old, 0);
}
/* }}} */
Sets user-level functions */
PHP_FUNCTION(session_set_save_handler)
{
- zval **args[6];
- int i;
- ps_user *mdata;
-
- if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_array_ex(6, args) == FAILURE)
- WRONG_PARAM_COUNT;
-
- if (PS(session_status) != php_session_none)
- RETURN_FALSE;
-
- zend_alter_ini_entry("session.save_handler", sizeof("session.save_handler"), "user", sizeof("user")-1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
+ zval **args[6];
+ int i;
+ ps_user *mdata;
- mdata = emalloc(sizeof(*mdata));
-
- for (i = 0; i < 6; i++) {
- ZVAL_ADDREF(*args[i]);
- mdata->names[i] = *args[i];
- }
+ if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_array_ex(6, args) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ if (PS(session_status) != php_session_none)
+ RETURN_FALSE;
+
+ zend_alter_ini_entry("session.save_handler", sizeof("session.save_handler"), "user", sizeof("user")-1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
- PS(mod_data) = (void *) mdata;
+ mdata = emalloc(sizeof(*mdata));
+
+ for (i = 0; i < 6; i++) {
+ ZVAL_ADDREF(*args[i]);
+ mdata->names[i] = *args[i];
+ }
- RETURN_TRUE;
+ PS(mod_data) = (void *) mdata;
+
+ RETURN_TRUE;
}
/* }}} */
Return the current save path passed to module_name. If newname is given, the save path is replaced with newname */
PHP_FUNCTION(session_save_path)
{
- zval **p_name;
- int ac = ZEND_NUM_ARGS();
- char *old;
-
- if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
- WRONG_PARAM_COUNT;
-
- old = estrdup(PS(save_path));
+ zval **p_name;
+ int ac = ZEND_NUM_ARGS();
+ char *old;
- if (ac == 1) {
- convert_to_string_ex(p_name);
- zend_alter_ini_entry("session.save_path", sizeof("session.save_path"), Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
- }
+ if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ old = estrdup(PS(save_path));
- RETVAL_STRING(old, 0);
+ if (ac == 1) {
+ convert_to_string_ex(p_name);
+ zend_alter_ini_entry("session.save_path", sizeof("session.save_path"), Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
+ }
+
+ RETVAL_STRING(old, 0);
}
/* }}} */
Return the current session id. If newid is given, the session id is replaced with newid */
PHP_FUNCTION(session_id)
{
- zval **p_name;
- int ac = ZEND_NUM_ARGS();
- char *old = empty_string;
-
- if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
- WRONG_PARAM_COUNT;
+ zval **p_name;
+ int ac = ZEND_NUM_ARGS();
+ char *old = empty_string;
- if (PS(id))
- old = estrdup(PS(id));
+ if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
+ WRONG_PARAM_COUNT;
- if (ac == 1) {
- convert_to_string_ex(p_name);
- if (PS(id)) efree(PS(id));
- PS(id) = estrndup(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name));
- }
+ if (PS(id))
+ old = estrdup(PS(id));
- RETVAL_STRING(old, 0);
+ if (ac == 1) {
+ convert_to_string_ex(p_name);
+ if (PS(id)) efree(PS(id));
+ PS(id) = estrndup(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name));
+ }
+
+ RETVAL_STRING(old, 0);
}
/* }}} */
Return the current cache limiter. If new_cache_limited is given, the current cache_limiter is replaced with new_cache_limiter */
PHP_FUNCTION(session_cache_limiter)
{
- zval **p_cache_limiter;
- int ac = ZEND_NUM_ARGS();
- char *old;
-
- if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_cache_limiter) == FAILURE)
- WRONG_PARAM_COUNT;
+ zval **p_cache_limiter;
+ int ac = ZEND_NUM_ARGS();
+ char *old;
- old = estrdup(PS(cache_limiter));
-
- if (ac == 1) {
- convert_to_string_ex(p_cache_limiter);
- zend_alter_ini_entry("session.cache_limiter", sizeof("session.cache_limiter"), Z_STRVAL_PP(p_cache_limiter), Z_STRLEN_PP(p_cache_limiter), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
- }
+ if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_cache_limiter) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ old = estrdup(PS(cache_limiter));
- RETVAL_STRING(old, 0);
+ if (ac == 1) {
+ convert_to_string_ex(p_cache_limiter);
+ zend_alter_ini_entry("session.cache_limiter", sizeof("session.cache_limiter"), Z_STRVAL_PP(p_cache_limiter), Z_STRLEN_PP(p_cache_limiter), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
+ }
+
+ RETVAL_STRING(old, 0);
}
/* }}} */
Return the current cache expire. If new_cache_expire is given, the current cache_expire is replaced with new_cache_expire */
PHP_FUNCTION(session_cache_expire)
{
- zval **p_cache_expire;
- int ac = ZEND_NUM_ARGS();
- long old;
+ zval **p_cache_expire;
+ int ac = ZEND_NUM_ARGS();
+ long old;
- old = PS(cache_expire);
+ old = PS(cache_expire);
- if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_cache_expire) == FAILURE)
- WRONG_PARAM_COUNT;
+ if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_cache_expire) == FAILURE)
+ WRONG_PARAM_COUNT;
- if (ac == 1) {
- convert_to_long_ex(p_cache_expire);
- PS(cache_expire) = Z_LVAL_PP(p_cache_expire);
- }
+ if (ac == 1) {
+ convert_to_long_ex(p_cache_expire);
+ PS(cache_expire) = Z_LVAL_PP(p_cache_expire);
+ }
- RETVAL_LONG(old);
+ RETVAL_LONG(old);
}
/* }}} */
/* {{{ static void php_register_var(zval** entry TSRMLS_DC) */
static void php_register_var(zval** entry TSRMLS_DC)
{
- zval **value;
-
- if (Z_TYPE_PP(entry) == IS_ARRAY) {
- zend_hash_internal_pointer_reset(Z_ARRVAL_PP(entry));
-
- while (zend_hash_get_current_data(Z_ARRVAL_PP(entry), (void**)&value) == SUCCESS) {
- php_register_var(value TSRMLS_CC);
- zend_hash_move_forward(Z_ARRVAL_PP(entry));
- }
- } else {
- convert_to_string_ex(entry);
-
- if ((strcmp(Z_STRVAL_PP(entry), "HTTP_SESSION_VARS") != 0) ||
- (strcmp(Z_STRVAL_PP(entry), "_SESSION") != 0)) {
- PS_ADD_VARL(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
- }
- }
+ zval **value;
+
+ if (Z_TYPE_PP(entry) == IS_ARRAY) {
+ zend_hash_internal_pointer_reset(Z_ARRVAL_PP(entry));
+
+ while (zend_hash_get_current_data(Z_ARRVAL_PP(entry), (void**)&value) == SUCCESS) {
+ php_register_var(value TSRMLS_CC);
+ zend_hash_move_forward(Z_ARRVAL_PP(entry));
+ }
+ } else {
+ convert_to_string_ex(entry);
+
+ if ((strcmp(Z_STRVAL_PP(entry), "HTTP_SESSION_VARS") != 0) ||
+ (strcmp(Z_STRVAL_PP(entry), "_SESSION") != 0)) {
+ PS_ADD_VARL(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
+ }
+ }
}
/* }}} */
Adds varname(s) to the list of variables which are freezed at the session end */
PHP_FUNCTION(session_register)
{
- zval ***args;
- int argc = ZEND_NUM_ARGS();
- int i;
-
- if (argc <= 0)
- RETURN_FALSE
- else
- args = (zval ***)emalloc(argc * sizeof(zval **));
-
- if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
- efree(args);
- WRONG_PARAM_COUNT;
- }
-
- if (PS(session_status) == php_session_none)
- php_session_start(TSRMLS_C);
-
- for (i = 0; i < argc; i++) {
- if (Z_TYPE_PP(args[i]) == IS_ARRAY)
- SEPARATE_ZVAL(args[i]);
- php_register_var(args[i] TSRMLS_CC);
- }
+ zval ***args;
+ int argc = ZEND_NUM_ARGS();
+ int i;
+
+ if (argc <= 0)
+ RETURN_FALSE
+ else
+ args = (zval ***)emalloc(argc * sizeof(zval **));
+
+ if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
+ efree(args);
+ WRONG_PARAM_COUNT;
+ }
- efree(args);
+ if (PS(session_status) == php_session_none)
+ php_session_start(TSRMLS_C);
- RETURN_TRUE;
+ for (i = 0; i < argc; i++) {
+ if (Z_TYPE_PP(args[i]) == IS_ARRAY)
+ SEPARATE_ZVAL(args[i]);
+ php_register_var(args[i] TSRMLS_CC);
+ }
+
+ efree(args);
+
+ RETURN_TRUE;
}
/* }}} */
Removes varname from the list of variables which are freezed at the session end */
PHP_FUNCTION(session_unregister)
{
- zval **p_name;
- int ac = ZEND_NUM_ARGS();
-
- if (ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
- WRONG_PARAM_COUNT;
-
- convert_to_string_ex(p_name);
+ zval **p_name;
+ int ac = ZEND_NUM_ARGS();
- PS_DEL_VARL(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name));
+ if (ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ convert_to_string_ex(p_name);
+
+ PS_DEL_VARL(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name));
- RETURN_TRUE;
+ RETURN_TRUE;
}
/* }}} */
Checks if a variable is registered in session */
PHP_FUNCTION(session_is_registered)
{
- zval **p_name;
- zval *p_var;
- int ac = ZEND_NUM_ARGS();
+ zval **p_name;
+ zval *p_var;
+ int ac = ZEND_NUM_ARGS();
- if (ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
- WRONG_PARAM_COUNT;
-
- convert_to_string_ex(p_name);
-
- if (zend_hash_find(&PS(vars), Z_STRVAL_PP(p_name),
- Z_STRLEN_PP(p_name)+1, (void **)&p_var) == SUCCESS)
- RETURN_TRUE
- else
- RETURN_FALSE;
+ if (ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ convert_to_string_ex(p_name);
+
+ if (zend_hash_find(&PS(vars), Z_STRVAL_PP(p_name),
+ Z_STRLEN_PP(p_name)+1, (void **)&p_var) == SUCCESS)
+ RETURN_TRUE
+ else
+ RETURN_FALSE;
}
/* }}} */
Serializes the current setup and returns the serialized representation */
PHP_FUNCTION(session_encode)
{
- int len;
- char *enc;
+ int len;
+ char *enc;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
- }
+ if (ZEND_NUM_ARGS() != 0) {
+ WRONG_PARAM_COUNT;
+ }
- enc = php_session_encode(&len TSRMLS_CC);
- RETVAL_STRINGL(enc, len, 0);
+ enc = php_session_encode(&len TSRMLS_CC);
+ RETVAL_STRINGL(enc, len, 0);
}
/* }}} */
Deserializes data and reinitializes the variables */
PHP_FUNCTION(session_decode)
{
- zval **str;
+ zval **str;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE)
- WRONG_PARAM_COUNT;
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE)
+ WRONG_PARAM_COUNT;
- convert_to_string_ex(str);
+ convert_to_string_ex(str);
- php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) TSRMLS_CC);
+ php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) TSRMLS_CC);
}
/* }}} */
Begin session - reinitializes freezed variables, registers browsers etc */
PHP_FUNCTION(session_start)
{
- /* skipping check for non-zero args for performance reasons here ?*/
- php_session_start(TSRMLS_C);
- RETURN_TRUE;
+ /* skipping check for non-zero args for performance reasons here ?*/
+ php_session_start(TSRMLS_C);
+ RETURN_TRUE;
}
/* }}} */
Destroy the current session and all data associated with it */
PHP_FUNCTION(session_destroy)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
- }
-
- if (php_session_destroy(TSRMLS_C) == SUCCESS) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
+ if (ZEND_NUM_ARGS() != 0) {
+ WRONG_PARAM_COUNT;
+ }
+
+ if (php_session_destroy(TSRMLS_C) == SUCCESS) {
+ RETURN_TRUE;
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
Unset all registered variables */
PHP_FUNCTION(session_unset)
{
- zval **tmp;
- char *variable;
- ulong num_key;
-
- if (PS(session_status) == php_session_none)
- RETURN_FALSE;
-
- if (PG(register_globals)) {
- for (zend_hash_internal_pointer_reset(&PS(vars));
- zend_hash_get_current_key(&PS(vars), &variable, &num_key, 0) == HASH_KEY_IS_STRING;
- zend_hash_move_forward(&PS(vars))) {
- if (zend_hash_find(&EG(symbol_table), variable, strlen(variable) + 1, (void **) &tmp)
- == SUCCESS)
- zend_hash_del(&EG(symbol_table), variable, strlen(variable) + 1);
- }
- }
-
- /* Clean $HTTP_SESSION_VARS. */
- zend_hash_clean(Z_ARRVAL_P(PS(http_session_vars)));
+ zval **tmp;
+ char *variable;
+ ulong num_key;
+
+ if (PS(session_status) == php_session_none)
+ RETURN_FALSE;
+
+ if (PG(register_globals)) {
+ for (zend_hash_internal_pointer_reset(&PS(vars));
+ zend_hash_get_current_key(&PS(vars), &variable, &num_key, 0) == HASH_KEY_IS_STRING;
+ zend_hash_move_forward(&PS(vars))) {
+ if (zend_hash_find(&EG(symbol_table), variable, strlen(variable) + 1, (void **) &tmp)
+ == SUCCESS)
+ zend_hash_del(&EG(symbol_table), variable, strlen(variable) + 1);
+ }
+ }
+
+ /* Clean $HTTP_SESSION_VARS. */
+ zend_hash_clean(Z_ARRVAL_P(PS(http_session_vars)));
}
/* }}} */
static void php_rshutdown_session_globals(TSRMLS_D)
{
- if (PS(mod_data)) {
- PS(mod)->close(&PS(mod_data) TSRMLS_CC);
- }
- if (PS(id)) {
- efree(PS(id));
- }
- zend_hash_destroy(&PS(vars));
+ if (PS(mod_data)) {
+ PS(mod)->close(&PS(mod_data) TSRMLS_CC);
+ }
+ if (PS(id)) {
+ efree(PS(id));
+ }
+ zend_hash_destroy(&PS(vars));
}
PHP_RINIT_FUNCTION(session)
{
- php_rinit_session_globals(TSRMLS_C);
+ php_rinit_session_globals(TSRMLS_C);
- if (PS(mod) == NULL) {
- char *value;
+ if (PS(mod) == NULL) {
+ char *value;
- value = zend_ini_string("session.save_handler", sizeof("session.save_handler"), 0);
- if (value) {
- PS(mod) = _php_find_ps_module(value TSRMLS_CC);
- }
+ value = zend_ini_string("session.save_handler", sizeof("session.save_handler"), 0);
+ if (value) {
+ PS(mod) = _php_find_ps_module(value TSRMLS_CC);
+ }
- if (!PS(mod)) {
- /* current status is unusable */
- PS(session_status) = php_session_disabled;
- return SUCCESS;
- }
- }
+ if (!PS(mod)) {
+ /* current status is unusable */
+ PS(session_status) = php_session_disabled;
+ return SUCCESS;
+ }
+ }
- if (PS(auto_start)) {
- php_session_start(TSRMLS_C);
- }
+ if (PS(auto_start)) {
+ php_session_start(TSRMLS_C);
+ }
- return SUCCESS;
+ return SUCCESS;
}
static void php_session_flush(TSRMLS_D)
{
- if(PS(session_status)==php_session_active) {
- php_session_save_current_state(TSRMLS_C);
- PS(session_status)=php_session_none;
- }
+ if(PS(session_status)==php_session_active) {
+ php_session_save_current_state(TSRMLS_C);
+ PS(session_status)=php_session_none;
+ }
}
/* {{{ proto void session_write_close(void)
Write session data and end session */
PHP_FUNCTION(session_write_close)
{
- php_session_flush(TSRMLS_C);
+ php_session_flush(TSRMLS_C);
}
PHP_RSHUTDOWN_FUNCTION(session)
PHP_MINIT_FUNCTION(session)
{
#ifdef ZTS
- php_ps_globals *ps_globals;
+ php_ps_globals *ps_globals;
- ts_allocate_id(&ps_globals_id, sizeof(php_ps_globals), NULL, NULL);
- ps_globals = ts_resource(ps_globals_id);
+ ts_allocate_id(&ps_globals_id, sizeof(php_ps_globals), NULL, NULL);
+ ps_globals = ts_resource(ps_globals_id);
#endif
- zend_register_auto_global("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC);
+ zend_register_auto_global("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC);
PS(module_number) = module_number; /* if we really need this var we need to init it in zts mode as well! */
REGISTER_INI_ENTRIES();
PHP_MSHUTDOWN_FUNCTION(session)
{
- UNREGISTER_INI_ENTRIES();
- return SUCCESS;
+ UNREGISTER_INI_ENTRIES();
+ return SUCCESS;
}
PHP_MINFO_FUNCTION(session)
{
- php_info_print_table_start();
- php_info_print_table_row(2, "Session Support", "enabled" );
- php_info_print_table_end();
+ php_info_print_table_start();
+ php_info_print_table_row(2, "Session Support", "enabled" );
+ php_info_print_table_end();
- DISPLAY_INI_ENTRIES();
+ DISPLAY_INI_ENTRIES();
}
projects / php / commitdiff