summaryrefslogtreecommitdiff
path: root/ext/standard/head.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/head.c')
-rw-r--r--ext/standard/head.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/standard/head.c b/ext/standard/head.c
index d8d5bce72e..ac8c9b1a72 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -64,7 +64,7 @@ PHP_FUNCTION(header_remove)
}
/* }}} */
-PHPAPI int php_header(TSRMLS_D) /* {{{ */
+PHPAPI int php_header(TSRMLS_D)
{
if (sapi_send_headers(TSRMLS_C)==FAILURE || SG(request_info).headers_only) {
return 0; /* don't allow output */
@@ -72,10 +72,9 @@ PHPAPI int php_header(TSRMLS_D) /* {{{ */
return 1; /* allow output */
}
}
-/* }}} */
-PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, time_t expires, char *path, int path_len, char *domain, int domain_len, int secure, int url_encode, int httponly TSRMLS_DC) /* {{{ */
+PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, time_t expires, char *path, int path_len, char *domain, int domain_len, int secure, int url_encode, int httponly TSRMLS_DC)
{
char *cookie, *encoded_value = NULL;
int len=sizeof("Set-Cookie: ");
@@ -168,7 +167,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
efree(cookie);
return result;
}
-/* }}} */
+
/* php_set_cookie(name, value, expires, path, domain, secure) */
/* {{{ proto bool setcookie(string name [, string value [, int expires [, string path [, string domain [, bool secure[, bool httponly]]]]]])
@@ -230,8 +229,8 @@ PHP_FUNCTION(headers_sent)
return;
if (SG(headers_sent)) {
- line = php_output_get_start_lineno(TSRMLS_C);
- file = php_output_get_start_filename(TSRMLS_C);
+ line = php_get_output_start_lineno(TSRMLS_C);
+ file = php_get_output_start_filename(TSRMLS_C);
}
switch(ZEND_NUM_ARGS()) {