diff options
| author | Michael Wallner <mike@php.net> | 2010-05-31 10:29:43 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2010-05-31 10:29:43 +0000 |
| commit | 11d24c1593d6617f73d3f290617bd8994182f4dc (patch) | |
| tree | eddeffa97ad3893b731144afb003e26ef0952de9 /ext/session/session.c | |
| parent | 27299b7e4084adb236acfbfb25168d72306ee802 (diff) | |
| download | php-git-11d24c1593d6617f73d3f290617bd8994182f4dc.tar.gz | |
* implement new output API, fixing some bugs and implementing some feature
requests--let's see what I can dig out of the bugtracker for NEWS--
and while crossing the road:
* implemented new zlib API
* fixed up ext/tidy (what was "s&" in zend_parse_parameters() supposed to do?)
Thanks to Jani and Felipe for pioneering.
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 25fa28f81f..ad406d857c 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1093,8 +1093,8 @@ static int php_session_cache_limiter(TSRMLS_D) /* {{{ */ if (PS(cache_limiter)[0] == '\0') return 0; if (SG(headers_sent)) { - char *output_start_filename = php_get_output_start_filename(TSRMLS_C); - int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); + char *output_start_filename = php_output_get_start_filename(TSRMLS_C); + int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); if (output_start_filename) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot send session cache limiter - headers already sent (output started at %s:%d)", output_start_filename, output_start_lineno); @@ -1133,8 +1133,8 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */ char *e_session_name, *e_id; if (SG(headers_sent)) { - char *output_start_filename = php_get_output_start_filename(TSRMLS_C); - int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); + char *output_start_filename = php_output_get_start_filename(TSRMLS_C); + int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); if (output_start_filename) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot send session cookie - headers already sent by (output started at %s:%d)", output_start_filename, output_start_lineno); |