diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 | 
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 | 
| commit | c3e3c98ec666812daaaca896cf5ef758a8a6df14 (patch) | |
| tree | d82a76de5c8d117d1cf2dcca19bb30a283621870 /ext/session/php_session.h | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'ext/session/php_session.h')
| -rw-r--r-- | ext/session/php_session.h | 24 | 
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/session/php_session.h b/ext/session/php_session.h index e553ca0e1a..790e116528 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -104,8 +104,8 @@ typedef struct _php_session_rfc1867_progress {  	zval      sid;  	smart_str key; -	php_int_t      update_step; -	php_int_t      next_update; +	zend_long      update_step; +	zend_long      next_update;  	double    next_update_time;  	zend_bool cancel_upload;  	zend_bool apply_trans_sid; @@ -125,8 +125,8 @@ typedef struct _php_ps_globals {  	char *extern_referer_chk;  	char *entropy_file;  	char *cache_limiter; -	php_int_t entropy_length; -	php_int_t cookie_lifetime; +	zend_long entropy_length; +	zend_long cookie_lifetime;  	char *cookie_path;  	char *cookie_domain;  	zend_bool  cookie_secure; @@ -135,11 +135,11 @@ typedef struct _php_ps_globals {  	ps_module *default_mod;  	void *mod_data;  	php_session_status session_status; -	php_int_t gc_probability; -	php_int_t gc_divisor; -	php_int_t gc_maxlifetime; +	zend_long gc_probability; +	zend_long gc_divisor; +	zend_long gc_maxlifetime;  	int module_number; -	php_int_t cache_expire; +	zend_long cache_expire;  	union {  		zval names[7];  		struct { @@ -162,11 +162,11 @@ typedef struct _php_ps_globals {  	zend_bool use_trans_sid;	/* contains the INI value of whether to use trans-sid */  	zend_bool apply_trans_sid;	/* whether or not to enable trans-sid for the current request */ -	php_int_t hash_func; +	zend_long hash_func;  #if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)  	php_hash_ops *hash_ops;  #endif -	php_int_t hash_bits_per_character; +	zend_long hash_bits_per_character;  	int send_cookie;  	int define_sid;  	zend_bool invalid_session_id;	/* allows the driver to report about an invalid session id and request id regeneration */ @@ -176,7 +176,7 @@ typedef struct _php_ps_globals {  	zend_bool rfc1867_cleanup; /* session.upload_progress.cleanup */  	char *rfc1867_prefix;  /* session.upload_progress.prefix */  	char *rfc1867_name;    /* session.upload_progress.name */ -	php_int_t rfc1867_freq;         /* session.upload_progress.freq */ +	zend_long rfc1867_freq;         /* session.upload_progress.freq */  	double rfc1867_min_freq;   /* session.upload_progress.min_freq */  	zend_bool use_strict_mode; /* whether or not PHP accepts unknown session ids */ @@ -254,7 +254,7 @@ PHPAPI void php_session_reset_id(TSRMLS_D);  #define PS_ENCODE_VARS 												\  	zend_string *key;												\ -	php_uint_t num_key;													\ +	zend_ulong num_key;													\  	zval *struc;  #define PS_ENCODE_LOOP(code) do {									\  | 
