diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/session/mod_user_class.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/session/mod_user_class.c')
| -rw-r--r-- | ext/session/mod_user_class.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c index 78b90f49fa..35a681babd 100644 --- a/ext/session/mod_user_class.c +++ b/ext/session/mod_user_class.c @@ -39,7 +39,7 @@ PHP_METHOD(SessionHandler, open) { char *save_path = NULL, *session_name = NULL; - int save_path_len, session_name_len; + size_t save_path_len, session_name_len; PS_SANITY_CHECK; @@ -125,7 +125,7 @@ PHP_METHOD(SessionHandler, destroy) Wraps the old gc handler */ PHP_METHOD(SessionHandler, gc) { - long maxlifetime; + zend_long maxlifetime; int nrdels; PS_SANITY_CHECK_IS_OPEN; @@ -144,6 +144,8 @@ PHP_METHOD(SessionHandler, create_sid) { zend_string *id; + PS_SANITY_CHECK; + if (zend_parse_parameters_none() == FAILURE) { return; } |