diff options
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 4f12e447ba..79b82f90f7 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1674,7 +1674,8 @@ PHPAPI void session_adapt_url(const char *url, size_t url_len, char **new_url, s Set session cookie parameters */ PHP_FUNCTION(session_set_cookie_params) { - zval *lifetime_or_options = NULL; + HashTable *options_ht; + zend_long lifetime_long; zend_string *lifetime = NULL, *path = NULL, *domain = NULL, *samesite = NULL; zend_bool secure = 0, secure_null = 1; zend_bool httponly = 0, httponly_null = 1; @@ -1687,12 +1688,12 @@ PHP_FUNCTION(session_set_cookie_params) } ZEND_PARSE_PARAMETERS_START(1, 5) - Z_PARAM_ZVAL(lifetime_or_options) + Z_PARAM_ARRAY_HT_OR_LONG(options_ht, lifetime_long) Z_PARAM_OPTIONAL - Z_PARAM_STR(path) - Z_PARAM_STR(domain) - Z_PARAM_BOOL_EX(secure, secure_null, 1, 0) - Z_PARAM_BOOL_EX(httponly, httponly_null, 1, 0) + Z_PARAM_STR_OR_NULL(path) + Z_PARAM_STR_OR_NULL(domain) + Z_PARAM_BOOL_OR_NULL(secure, secure_null) + Z_PARAM_BOOL_OR_NULL(httponly, httponly_null) ZEND_PARSE_PARAMETERS_END(); if (PS(session_status) == php_session_active) { @@ -1705,20 +1706,31 @@ PHP_FUNCTION(session_set_cookie_params) RETURN_FALSE; } - if (Z_TYPE_P(lifetime_or_options) == IS_ARRAY) { + if (options_ht) { zend_string *key; zval *value; if (path) { - path = NULL; - domain = NULL; - secure_null = 1; - httponly_null = 1; - php_error_docref(NULL, E_WARNING, "Cannot pass arguments after the options array"); - RETURN_FALSE; + zend_argument_value_error(2, "must be null when argument #1 ($lifetime_or_options) is an array"); + RETURN_THROWS(); + } + + if (domain) { + zend_argument_value_error(3, "must be null when argument #1 ($lifetime_or_options) is an array"); + RETURN_THROWS(); + } + + if (!secure_null) { + zend_argument_value_error(4, "must be null when argument #1 ($lifetime_or_options) is an array"); + RETURN_THROWS(); + } + + if (!httponly_null) { + zend_argument_value_error(5, "must be null when argument #1 ($lifetime_or_options) is an array"); + RETURN_THROWS(); } - ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(lifetime_or_options), key, value) { + ZEND_HASH_FOREACH_STR_KEY_VAL(options_ht, key, value) { if (key) { ZVAL_DEREF(value); if(!strcasecmp("lifetime", ZSTR_VAL(key))) { @@ -1754,7 +1766,7 @@ PHP_FUNCTION(session_set_cookie_params) RETURN_THROWS(); } } else { - lifetime = zval_get_string(lifetime_or_options); + lifetime = zend_long_to_str(lifetime_long); } /* Exception during string conversion */ |