diff options
| author | Anatol Belski <ab@php.net> | 2014-01-22 12:05:06 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-22 12:05:06 +0100 |
| commit | ca27c86110e40f7a38baa196c20a0a3997ffefe8 (patch) | |
| tree | 97ddcc75c08be141a40d2ca06f7afe9be21043dc | |
| parent | 4247f624cb4f3a83bee0b2624a4ddb8d024bd005 (diff) | |
| parent | 6d1d8ec3308437d7e5dc3900cea1ee26bf76406c (diff) | |
| download | php-git-ca27c86110e40f7a38baa196c20a0a3997ffefe8.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix zts
| -rw-r--r-- | ext/session/session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 755cebd542..38aee7d680 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1302,7 +1302,7 @@ static int php_session_cache_limiter(TSRMLS_D) /* {{{ */ * It must be directly removed from SG(sapi_header) because sapi_add_header_ex() * removes all of matching cookie. i.e. It deletes all of Set-Cookie headers. */ -static void php_session_remove_cookie() { +static void php_session_remove_cookie(TSRMLS_D) { sapi_header_struct *header; zend_llist *l = &SG(sapi_headers).headers; zend_llist_element *next; @@ -1408,7 +1408,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */ smart_str_0(&ncookie); - php_session_remove_cookie(); /* remove already sent session ID cookie */ + php_session_remove_cookie(TSRMLS_C); /* remove already sent session ID cookie */ sapi_add_header_ex(ncookie.c, ncookie.len, 0, 0 TSRMLS_CC); } /* }}} */ |