diff options
| author | STANLEY SUFFICOOL <ssufficool@php.net> | 2014-10-24 20:00:48 -0700 |
|---|---|---|
| committer | STANLEY SUFFICOOL <ssufficool@php.net> | 2014-10-24 20:00:48 -0700 |
| commit | e33ba844e52c5dc8e2fb1658a51bec611e78f7ba (patch) | |
| tree | 2e6f416aac4b0a5668976db500ada1bdcc2b399e /ext/standard/head.c | |
| parent | 5f91b0a3c717f109ffb7dc684d5a3fa8905b82ec (diff) | |
| parent | 0a5b7d1316a778dc06a638869c8df8d4c989ddf0 (diff) | |
| download | php-git-e33ba844e52c5dc8e2fb1658a51bec611e78f7ba.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (164 commits)
refix the broken place
fix infinite loop
fix datatype mismatch warnings
fix datatype mismatches
fix datatype mismatches
fix datatype mismatches
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warning
fix datatype mismatches
fix datatype mismatch warnings
Re-add phpdbg to travis
Added some NEWS
Make xml valid (missing space between attrs)
Fix info classes file name in xml
Add note about <eval> tag for errors in xml.md
Name the tag <eval> if the error id during ev cmd
Do not print out xml as PHP print...
Fix output to wrong function
...
Diffstat (limited to 'ext/standard/head.c')
| -rw-r--r-- | ext/standard/head.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/head.c b/ext/standard/head.c index 3dd18ee0fd..1417b52bc0 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -73,10 +73,10 @@ PHPAPI int php_header(TSRMLS_D) } -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, size_t name_len, char *value, size_t value_len, time_t expires, char *path, size_t path_len, char *domain, size_t domain_len, int secure, int url_encode, int httponly TSRMLS_DC) { char *cookie; - int len=sizeof("Set-Cookie: "); + size_t len=sizeof("Set-Cookie: "); zend_string *dt; sapi_header_line ctr = {0}; int result; @@ -164,7 +164,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t } ctr.line = cookie; - ctr.line_len = strlen(cookie); + ctr.line_len = (uint)strlen(cookie); result = sapi_header_op(SAPI_HEADER_ADD, &ctr TSRMLS_CC); efree(cookie); @@ -300,7 +300,7 @@ PHP_FUNCTION(http_response_code) zend_long old_response_code; old_response_code = SG(sapi_headers).http_response_code; - SG(sapi_headers).http_response_code = response_code; + SG(sapi_headers).http_response_code = (int)response_code; if (old_response_code) { RETURN_LONG(old_response_code); |