mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-09 12:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unicode support for headers_sent().

Browse Source
This commit is contained in:
Andrei Zmievski 2006-10-19 17:55:33 +00:00
parent 7bf64871c9
commit 73b75cf052
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ext/standard/head.c
View File

@ -191,7 +191,7 @@ PHP_FUNCTION(setrawcookie)
/* }}} */ /* }}} */
/* {{{ proto bool headers_sent([string &$file [, int &$line]]) /* {{{ proto bool headers_sent([string &$file [, int &$line]]) U
Returns true if headers have already been sent, false otherwise */ Returns true if headers have already been sent, false otherwise */
PHP_FUNCTION(headers_sent) PHP_FUNCTION(headers_sent)
{ {
@ -208,17 +208,28 @@ PHP_FUNCTION(headers_sent)
} }
switch(ZEND_NUM_ARGS()) { switch(ZEND_NUM_ARGS()) {
case 2: case 2:
zval_dtor(arg2); zval_dtor(arg2);
ZVAL_LONG(arg2, line); ZVAL_LONG(arg2, line);
case 1: case 1:
zval_dtor(arg1); zval_dtor(arg1);
if (file) { if (UG(unicode)) {
ZVAL_STRING(arg1, file, 1); UChar *ufile;
} else { int ufile_len;
ZVAL_STRING(arg1, "", 1);
} if (file && SUCCESS == php_stream_path_decode(NULL, &ufile, &ufile_len, file, strlen(file), REPORT_ERRORS, FG(default_context))) {
break; ZVAL_UNICODEL(arg1, ufile, ufile_len, 0);
} else {
ZVAL_EMPTY_UNICODE(arg1);
}
} else {
if (file) {
ZVAL_STRING(arg1, file, 1);
} else {
ZVAL_STRING(arg1, "", 1);
}
}
break;
} }
if (SG(headers_sent)) { if (SG(headers_sent)) {