diff options
| author | Anatol Belski <ab@php.net> | 2014-01-22 12:04:25 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-22 12:04:25 +0100 |
| commit | 6d1d8ec3308437d7e5dc3900cea1ee26bf76406c (patch) | |
| tree | bebbc0e52fabc32674e7df6b5b87622ed0f929cc | |
| parent | e67ef24227d3fbd4a3ef0a44ada03fea2a6f5263 (diff) | |
| parent | 34792280bcd2210784ba574d52fc3619cc06160d (diff) | |
| download | php-git-6d1d8ec3308437d7e5dc3900cea1ee26bf76406c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 700eeed94f..7822ffe59c 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1280,7 +1280,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; @@ -1386,7 +1386,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); } /* }}} */ |