diff options
Diffstat (limited to 'ext/standard/head.c')
| -rw-r--r-- | ext/standard/head.c | 66 |
1 files changed, 43 insertions, 23 deletions
diff --git a/ext/standard/head.c b/ext/standard/head.c index eac9159ab9..32e1eadbb5 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -42,11 +42,14 @@ PHP_FUNCTION(header) sapi_header_line ctr = {0}; size_t len; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|bl", &ctr.line, - &len, &rep, &ctr.response_code) == FAILURE) - return; - - ctr.line_len = (uint)len; + ZEND_PARSE_PARAMETERS_START(1, 3) + Z_PARAM_STRING(ctr.line, len) + Z_PARAM_OPTIONAL + Z_PARAM_BOOL(rep) + Z_PARAM_LONG(ctr.response_code) + ZEND_PARSE_PARAMETERS_END(); + + ctr.line_len = (uint32_t)len; sapi_header_op(rep ? SAPI_HEADER_REPLACE:SAPI_HEADER_ADD, &ctr); } /* }}} */ @@ -58,11 +61,12 @@ PHP_FUNCTION(header_remove) sapi_header_line ctr = {0}; size_t len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &ctr.line, - &len) == FAILURE) - return; + ZEND_PARSE_PARAMETERS_START(0, 1) + Z_PARAM_OPTIONAL + Z_PARAM_STRING(ctr.line, len) + ZEND_PARSE_PARAMETERS_END(); - ctr.line_len = (uint)len; + ctr.line_len = (uint32_t)len; sapi_header_op(ZEND_NUM_ARGS() == 0 ? SAPI_HEADER_DELETE_ALL : SAPI_HEADER_DELETE, &ctr); } /* }}} */ @@ -174,7 +178,7 @@ PHPAPI int php_setcookie(zend_string *name, zend_string *value, time_t expires, } ctr.line = cookie; - ctr.line_len = (uint)strlen(cookie); + ctr.line_len = (uint32_t)strlen(cookie); result = sapi_header_op(SAPI_HEADER_ADD, &ctr); efree(cookie); @@ -191,10 +195,16 @@ PHP_FUNCTION(setcookie) zend_long expires = 0; zend_bool secure = 0, httponly = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|SlSSbb", - &name, &value, &expires, &path, &domain, &secure, &httponly) == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_START(1, 7) + Z_PARAM_STR(name) + Z_PARAM_OPTIONAL + Z_PARAM_STR(value) + Z_PARAM_LONG(expires) + Z_PARAM_STR(path) + Z_PARAM_STR(domain) + Z_PARAM_BOOL(secure) + Z_PARAM_BOOL(httponly) + ZEND_PARSE_PARAMETERS_END(); if (php_setcookie(name, value, expires, path, domain, secure, 1, httponly) == SUCCESS) { RETVAL_TRUE; @@ -212,10 +222,16 @@ PHP_FUNCTION(setrawcookie) zend_long expires = 0; zend_bool secure = 0, httponly = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|SlSSbb", - &name, &value, &expires, &path, &domain, &secure, &httponly) == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_START(1, 7) + Z_PARAM_STR(name) + Z_PARAM_OPTIONAL + Z_PARAM_STR(value) + Z_PARAM_LONG(expires) + Z_PARAM_STR(path) + Z_PARAM_STR(domain) + Z_PARAM_BOOL(secure) + Z_PARAM_BOOL(httponly) + ZEND_PARSE_PARAMETERS_END(); if (php_setcookie(name, value, expires, path, domain, secure, 0, httponly) == SUCCESS) { RETVAL_TRUE; @@ -234,8 +250,11 @@ PHP_FUNCTION(headers_sent) const char *file=""; int line=0; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z/z/", &arg1, &arg2) == FAILURE) - return; + ZEND_PARSE_PARAMETERS_START(0, 2) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_DEREF_EX(arg1, 0, 1) + Z_PARAM_ZVAL_DEREF_EX(arg2, 0, 1) + ZEND_PARSE_PARAMETERS_END(); if (SG(headers_sent)) { line = php_output_get_start_lineno(); @@ -294,9 +313,10 @@ PHP_FUNCTION(http_response_code) { zend_long response_code = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &response_code) == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_START(0, 1) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(response_code) + ZEND_PARSE_PARAMETERS_END(); if (response_code) { |