diff options
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/basic_functions.c | 50 | ||||
| -rw-r--r-- | ext/standard/exec.c | 4 | ||||
| -rw-r--r-- | ext/standard/head.c | 11 | ||||
| -rw-r--r-- | ext/standard/info.c | 599 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/ob_get_flush_error.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/phpinfo.phpt | 1 | ||||
| -rw-r--r-- | ext/standard/url_scanner_ex.c | 12 | ||||
| -rw-r--r-- | ext/standard/url_scanner_ex.re | 10 | ||||
| -rw-r--r-- | ext/standard/var.c | 6 |
9 files changed, 402 insertions, 293 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 02b661ca5d..38c608f670 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5137,7 +5137,7 @@ ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highl PHP_FUNCTION(highlight_file) { char *filename; - int filename_len, ret; + int filename_len; zend_syntax_highlighter_ini syntax_highlighter_ini; zend_bool i = 0; @@ -5154,23 +5154,32 @@ PHP_FUNCTION(highlight_file) } if (i) { - php_output_start_default(TSRMLS_C); + php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); } php_get_highlight_struct(&syntax_highlighter_ini); - ret = highlight_file(filename, &syntax_highlighter_ini TSRMLS_CC); - - if (ret == FAILURE) { + if (highlight_file(filename, &syntax_highlighter_ini TSRMLS_CC) == FAILURE) { if (i) { - php_output_end(TSRMLS_C); + int res = php_ob_get_buffer(return_value TSRMLS_CC); + + /* flush the buffer only if there is something to flush */ + if (res == SUCCESS && Z_STRLEN_P(return_value) > 0) { + php_end_ob_buffer (1, 0 TSRMLS_CC); + zval_dtor(return_value); + } else { + php_end_ob_buffer (0, 0 TSRMLS_CC); + if (res == SUCCESS) { + zval_dtor(return_value); + } + } } RETURN_FALSE; } if (i) { - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer (return_value TSRMLS_CC); + php_end_ob_buffer (0, 0 TSRMLS_CC); } else { RETURN_TRUE; } @@ -5190,26 +5199,25 @@ PHP_FUNCTION(php_strip_whitespace) RETURN_FALSE; } - php_output_start_default(TSRMLS_C); - file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = filename; file_handle.free_filename = 0; file_handle.opened_path = NULL; zend_save_lexical_state(&original_lex_state TSRMLS_CC); - if (open_file_for_scanning(&file_handle TSRMLS_CC) == FAILURE) { + if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) { zend_restore_lexical_state(&original_lex_state TSRMLS_CC); - php_output_end(TSRMLS_C); RETURN_EMPTY_STRING(); } + php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC); + zend_strip(TSRMLS_C); zend_destroy_file_handle(&file_handle TSRMLS_CC); zend_restore_lexical_state(&original_lex_state TSRMLS_CC); - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer(return_value TSRMLS_CC); + php_end_ob_buffer(0, 0 TSRMLS_CC); } /* }}} */ @@ -5229,7 +5237,7 @@ PHP_FUNCTION(highlight_string) convert_to_string_ex(expr); if (i) { - php_output_start_default(TSRMLS_C); + php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); } EG(error_reporting) = E_ERROR; @@ -5242,7 +5250,7 @@ PHP_FUNCTION(highlight_string) efree(hicompiled_string_description); EG(error_reporting) = old_error_reporting; if (i) { - php_output_end(TSRMLS_C); + php_end_ob_buffer (1, 0 TSRMLS_CC); } RETURN_FALSE; } @@ -5251,8 +5259,8 @@ PHP_FUNCTION(highlight_string) EG(error_reporting) = old_error_reporting; if (i) { - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer (return_value TSRMLS_CC); + php_end_ob_buffer (0, 0 TSRMLS_CC); } else { RETURN_TRUE; } @@ -5509,14 +5517,14 @@ PHP_FUNCTION(print_r) } if (do_return) { - php_output_start_default(TSRMLS_C); + php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); } zend_print_zval_r(var, 0 TSRMLS_CC); if (do_return) { - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer (return_value TSRMLS_CC); + php_end_ob_buffer (0, 0 TSRMLS_CC); } else { RETURN_TRUE; } diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 7e770abd1d..5850026e17 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -139,10 +139,8 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_ } if (type == 1) { - int ob_level; - PHPWRITE(buf, bufl); - if ((php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL, &ob_level TSRMLS_CC) == SUCCESS) && ob_level < 1) { + if (OG(ob_nesting_level) < 1) { sapi_flush(TSRMLS_C); } } else if (type == 2) { diff --git a/ext/standard/head.c b/ext/standard/head.c index d8d5bce72e..ac8c9b1a72 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -64,7 +64,7 @@ PHP_FUNCTION(header_remove) } /* }}} */ -PHPAPI int php_header(TSRMLS_D) /* {{{ */ +PHPAPI int php_header(TSRMLS_D) { if (sapi_send_headers(TSRMLS_C)==FAILURE || SG(request_info).headers_only) { return 0; /* don't allow output */ @@ -72,10 +72,9 @@ PHPAPI int php_header(TSRMLS_D) /* {{{ */ return 1; /* allow output */ } } -/* }}} */ -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, 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) { char *cookie, *encoded_value = NULL; int len=sizeof("Set-Cookie: "); @@ -168,7 +167,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t efree(cookie); return result; } -/* }}} */ + /* php_set_cookie(name, value, expires, path, domain, secure) */ /* {{{ proto bool setcookie(string name [, string value [, int expires [, string path [, string domain [, bool secure[, bool httponly]]]]]]) @@ -230,8 +229,8 @@ PHP_FUNCTION(headers_sent) return; if (SG(headers_sent)) { - line = php_output_get_start_lineno(TSRMLS_C); - file = php_output_get_start_filename(TSRMLS_C); + line = php_get_output_start_lineno(TSRMLS_C); + file = php_get_output_start_filename(TSRMLS_C); } switch(ZEND_NUM_ARGS()) { diff --git a/ext/standard/info.c b/ext/standard/info.c index 792fd0834b..a1e2b1edff 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -38,15 +38,16 @@ #include <sys/utsname.h> #endif - #ifdef PHP_WIN32 typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD); + # include "winver.h" -# if _MSC_VER < 1300 -# define OSVERSIONINFOEX php_win_OSVERSIONINFOEX -# endif +#if _MSC_VER < 1300 +# define OSVERSIONINFOEX php_win_OSVERSIONINFOEX +#endif + #endif #if HAVE_MBSTRING @@ -60,7 +61,7 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv) #endif #define SECTION(name) if (!sapi_module.phpinfo_as_text) { \ - php_info_print("<h2>" name "</h2>\n"); \ + PUTS("<h2>" name "</h2>\n"); \ } else { \ php_info_print_table_start(); \ php_info_print_table_header(1, name); \ @@ -70,99 +71,29 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv) PHPAPI extern char *php_ini_opened_path; PHPAPI extern char *php_ini_scanned_path; PHPAPI extern char *php_ini_scanned_files; - -static int php_info_print_html_esc(const char *str, int len) /* {{{ */ + +static int php_info_write_wrapper(const char *str, uint str_length) { int new_len, written; - char *new_str; - TSRMLS_FETCH(); - - new_str = php_escape_html_entities((char *) str, len, &new_len, 0, ENT_QUOTES, "utf-8" TSRMLS_CC); - written = php_output_write(new_str, new_len TSRMLS_CC); - efree(new_str); - return written; -} -/* }}} */ + char *elem_esc; -static int php_info_printf(const char *fmt, ...) /* {{{ */ -{ - char *buf; - int len, written; - va_list argv; TSRMLS_FETCH(); - - va_start(argv, fmt); - len = vspprintf(&buf, 0, fmt, argv); - va_end(argv); - - written = php_output_write(buf, len TSRMLS_CC); - efree(buf); - return written; -} -/* }}} */ -static void php_info_print_request_uri(TSRMLS_D) /* {{{ */ -{ - if (SG(request_info).request_uri) { - php_info_print_html_esc(SG(request_info).request_uri, strlen(SG(request_info).request_uri)); - } -} -/* }}} */ + elem_esc = php_escape_html_entities((unsigned char *)str, str_length, &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); -static int php_info_print(const char *str) /* {{{ */ -{ - TSRMLS_FETCH(); - return php_output_write(str, strlen(str) TSRMLS_CC); -} -/* }}} */ + written = php_body_write(elem_esc, new_len TSRMLS_CC); -static void php_info_print_stream_hash(const char *name, HashTable *ht TSRMLS_DC) /* {{{ */ -{ - char *key; - uint len; - int type; - - if (ht) { - if (zend_hash_num_elements(ht)) { - HashPosition pos; + efree(elem_esc); - if (!sapi_module.phpinfo_as_text) { - php_info_printf("<tr class=\"v\"><td>Registered %s</td><td>", name); - } else { - php_info_printf("\nRegistered %s => ", name); - } - - zend_hash_internal_pointer_reset_ex(ht, &pos); - while (zend_hash_get_current_key_ex(ht, &key, &len, NULL, 0, &pos) == HASH_KEY_IS_STRING) - { - php_info_print(key); - zend_hash_move_forward_ex(ht, &pos); - if (zend_hash_get_current_key_ex(ht, &key, &len, NULL, 0, &pos) == HASH_KEY_IS_STRING) { - php_info_print(", "); - } else { - break; - } - } - - if (!sapi_module.phpinfo_as_text) { - php_info_print("</td></tr>\n"); - } - } else { - char reg_name[128]; - snprintf(reg_name, sizeof(reg_name), "Registered %s", name); - php_info_print_table_row(2, reg_name, "none registered"); - } - } else { - php_info_print_table_row(2, name, "disabled"); - } + return written; } -/* }}} */ + PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /* {{{ */ { if (zend_module->info_func || zend_module->version) { if (!sapi_module.phpinfo_as_text) { - php_info_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", zend_module->name, zend_module->name); + php_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", zend_module->name, zend_module->name); } else { php_info_print_table_start(); php_info_print_table_header(1, zend_module->name); @@ -178,9 +109,9 @@ PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /* { } } else { if (!sapi_module.phpinfo_as_text) { - php_info_printf("<tr><td>%s</td></tr>\n", zend_module->name); + php_printf("<tr><td>%s</td></tr>\n", zend_module->name); } else { - php_info_printf("%s\n", zend_module->name); + php_printf("%s\n", zend_module->name); } } } @@ -220,66 +151,70 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC) zend_hash_internal_pointer_reset(Z_ARRVAL_PP(data)); while (zend_hash_get_current_data(Z_ARRVAL_PP(data), (void **) &tmp) == SUCCESS) { if (!sapi_module.phpinfo_as_text) { - php_info_print("<tr>"); - php_info_print("<td class=\"e\">"); + PUTS("<tr>"); + PUTS("<td class=\"e\">"); + } - php_info_print(name); - php_info_print("[\""); + PUTS(name); + PUTS("[\""); switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(data), &string_key, &string_len, &num_key, 0, NULL)) { case HASH_KEY_IS_STRING: if (!sapi_module.phpinfo_as_text) { - php_info_print_html_esc(string_key, string_len-1); + php_info_html_esc_write(string_key, string_len - 1 TSRMLS_CC); } else { - php_info_print(string_key); - } + PHPWRITE(string_key, string_len - 1); + } break; case HASH_KEY_IS_LONG: - php_info_printf("%ld", num_key); + php_printf("%ld", num_key); break; } - php_info_print("\"]"); + PUTS("\"]"); if (!sapi_module.phpinfo_as_text) { - php_info_print("</td><td class=\"v\">"); + PUTS("</td><td class=\"v\">"); } else { - php_info_print(" => "); + PUTS(" => "); } if (Z_TYPE_PP(tmp) == IS_ARRAY) { if (!sapi_module.phpinfo_as_text) { - php_info_print("<pre>"); - zend_print_zval_r_ex((zend_write_func_t) php_info_print_html_esc, *tmp, 0 TSRMLS_CC); - php_info_print("</pre>"); + PUTS("<pre>"); + zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0 TSRMLS_CC); + PUTS("</pre>"); } else { zend_print_zval_r(*tmp, 0 TSRMLS_CC); } - } else { + } else if (Z_TYPE_PP(tmp) != IS_STRING) { tmp2 = **tmp; - switch (Z_TYPE_PP(tmp)) { - default: - tmp = NULL; - zval_copy_ctor(&tmp2); - convert_to_string(&tmp2); - case IS_STRING: - if (!sapi_module.phpinfo_as_text) { - if (Z_STRLEN(tmp2) == 0) { - php_info_print("<i>no value</i>"); - } else { - php_info_print_html_esc(Z_STRVAL(tmp2), Z_STRLEN(tmp2)); - } - } else { - php_info_print(Z_STRVAL(tmp2)); - } - } - if (!tmp) { - zval_dtor(&tmp2); - } + zval_copy_ctor(&tmp2); + convert_to_string(&tmp2); + if (!sapi_module.phpinfo_as_text) { + if (Z_STRLEN(tmp2) == 0) { + PUTS("<i>no value</i>"); + } else { + php_info_html_esc_write(Z_STRVAL(tmp2), Z_STRLEN(tmp2) TSRMLS_CC); + } + } else { + PHPWRITE(Z_STRVAL(tmp2), Z_STRLEN(tmp2)); + } + zval_dtor(&tmp2); + } else { + if (!sapi_module.phpinfo_as_text) { + if (Z_STRLEN_PP(tmp) == 0) { + PUTS("<i>no value</i>"); + } else { + php_info_html_esc_write(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp) TSRMLS_CC); + } + } else { + PHPWRITE(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); + } } if (!sapi_module.phpinfo_as_text) { - php_info_print("</td></tr>\n"); + PUTS("</td></tr>\n"); } else { - php_info_print("\n"); - } + PUTS("\n"); + } zend_hash_move_forward(Z_ARRVAL_PP(data)); } } @@ -290,9 +225,21 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC) */ void php_info_print_style(TSRMLS_D) { - php_info_printf("<style type=\"text/css\">\n"); + php_printf("<style type=\"text/css\">\n"); php_info_print_css(TSRMLS_C); - php_info_printf("</style>\n"); + php_printf("</style>\n"); +} +/* }}} */ + +/* {{{ php_info_html_esc_write + */ +PHPAPI void php_info_html_esc_write(char *string, int str_len TSRMLS_DC) +{ + int new_len; + char *ret = php_escape_html_entities((unsigned char *)string, str_len, &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); + + PHPWRITE(ret, new_len); + efree(ret); } /* }}} */ @@ -301,13 +248,13 @@ void php_info_print_style(TSRMLS_D) PHPAPI char *php_info_html_esc(char *string TSRMLS_DC) { int new_len; - return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); + return php_escape_html_entities((unsigned char *)string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); } /* }}} */ + #ifdef PHP_WIN32 /* {{{ */ - char* php_get_windows_name() { OSVERSIONINFOEX osvi; @@ -402,9 +349,9 @@ char* php_get_windows_name() if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2 ) { if (GetSystemMetrics(SM_SERVERR2)) major = "Windows Server 2003 R2"; - else if (osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER) + else if (osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER) major = "Windows Storage Server 2003"; - else if (osvi.wSuiteMask==VER_SUITE_WH_SERVER) + else if (osvi.wSuiteMask == VER_SUITE_WH_SERVER) major = "Windows Home Server"; else if (osvi.wProductType == VER_NT_WORKSTATION && si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64) { @@ -630,18 +577,54 @@ PHPAPI char *php_get_uname(char mode) } /* }}} */ + /* {{{ php_print_info_htmlhead */ PHPAPI void php_print_info_htmlhead(TSRMLS_D) { - php_info_print("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\">\n"); - php_info_print("<html>"); - php_info_print("<head>\n"); + +/*** none of this is needed now *** + + const char *charset = NULL; + + if (SG(default_charset)) { + charset = SG(default_charset); + } + +#if HAVE_MBSTRING + if (php_ob_handler_used("mb_output_handler" TSRMLS_CC)) { + if (MBSTRG(current_http_output_encoding) == mbfl_no_encoding_pass) { + charset = "US-ASCII"; + } else { + charset = mbfl_no2preferred_mime_name(MBSTRG(current_http_output_encoding)); + } + } +#endif + +#if HAVE_ICONV + if (php_ob_handler_used("ob_iconv_handler" TSRMLS_CC)) { + charset = ICONVG(output_encoding); + } +#endif + + if (!charset || !charset[0]) { + charset = "US-ASCII"; + } + +*** none of that is needed now ***/ + + + PUTS("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\">\n"); + PUTS("<html>"); + PUTS("<head>\n"); php_info_print_style(TSRMLS_C); - php_info_print("<title>phpinfo()</title>"); - php_info_print("<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW,NOARCHIVE\" />"); - php_info_print("</head>\n"); - php_info_print("<body><div class=\"center\">\n"); + PUTS("<title>phpinfo()</title>"); + PUTS("<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW,NOARCHIVE\" />"); +/* + php_printf("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />\n", charset); +*/ + PUTS("</head>\n"); + PUTS("<body><div class=\"center\">\n"); } /* }}} */ @@ -667,8 +650,8 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (!sapi_module.phpinfo_as_text) { php_print_info_htmlhead(TSRMLS_C); } else { - php_info_print("phpinfo()\n"); - } + PUTS("phpinfo()\n"); + } if (flag & PHP_INFO_GENERAL) { char *zend_version = get_zend_version(); @@ -682,17 +665,21 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) } if (expose_php && !sapi_module.phpinfo_as_text) { - php_info_print("<a href=\"http://www.php.net/\"><img border=\"0\" src=\""); - php_info_print_request_uri(TSRMLS_C); - php_info_print("?="); + PUTS("<a href=\"http://www.php.net/\"><img border=\"0\" src=\""); + if (SG(request_info).request_uri) { + char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); + PUTS(elem_esc); + efree(elem_esc); + } + PUTS("?="); logo_guid = php_logo_guid(); - php_info_print(logo_guid); + PUTS(logo_guid); efree(logo_guid); - php_info_print("\" alt=\"PHP Logo\" /></a>"); + PUTS("\" alt=\"PHP Logo\" /></a>"); } if (!sapi_module.phpinfo_as_text) { - php_info_printf("<h1 class=\"p\">PHP Version %s</h1>\n", PHP_VERSION); + php_printf("<h1 class=\"p\">PHP Version %s</h1>\n", PHP_VERSION); } else { php_info_print_table_row(2, "PHP Version", PHP_VERSION); } @@ -762,24 +749,139 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) #else php_info_print_table_row(2, "IPv6 Support", "disabled" ); #endif - - php_info_print_stream_hash("PHP Streams", php_stream_get_url_stream_wrappers_hash() TSRMLS_CC); - php_info_print_stream_hash("Stream Socket Transports", php_stream_xport_get_hash() TSRMLS_CC); - php_info_print_stream_hash("Stream Filters", php_get_stream_filters_hash() TSRMLS_CC); + { + HashTable *url_stream_wrappers_hash; + char *stream_protocol, *stream_protocols_buf = NULL; + int stream_protocol_len, stream_protocols_buf_len = 0; + ulong num_key; + + if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) { + HashPosition pos; + for (zend_hash_internal_pointer_reset_ex(url_stream_wrappers_hash, &pos); + zend_hash_get_current_key_ex(url_stream_wrappers_hash, &stream_protocol, (uint *)&stream_protocol_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING; + zend_hash_move_forward_ex(url_stream_wrappers_hash, &pos)) { + stream_protocols_buf = erealloc(stream_protocols_buf, stream_protocols_buf_len + stream_protocol_len + 2 + 1); + memcpy(stream_protocols_buf + stream_protocols_buf_len, stream_protocol, stream_protocol_len - 1); + stream_protocols_buf[stream_protocols_buf_len + stream_protocol_len - 1] = ','; + stream_protocols_buf[stream_protocols_buf_len + stream_protocol_len] = ' '; + stream_protocols_buf_len += stream_protocol_len + 1; + } + if (stream_protocols_buf) { + stream_protocols_buf[stream_protocols_buf_len - 2] = ' '; + stream_protocols_buf[stream_protocols_buf_len] = 0; + php_info_print_table_row(2, "Registered PHP Streams", stream_protocols_buf); + efree(stream_protocols_buf); + } else { + /* Any chances we will ever hit this? */ + php_info_print_table_row(2, "Registered PHP Streams", "no streams registered"); + } + } else { + /* Any chances we will ever hit this? */ + php_info_print_table_row(2, "PHP Streams", "disabled"); /* ?? */ + } + } + { + HashTable *stream_xport_hash; + char *xport_name, *xport_buf = NULL; + int xport_name_len, xport_buf_len = 0, xport_buf_size = 0; + ulong num_key; + + if ((stream_xport_hash = php_stream_xport_get_hash())) { + HashPosition pos; + for(zend_hash_internal_pointer_reset_ex(stream_xport_hash, &pos); + zend_hash_get_current_key_ex(stream_xport_hash, &xport_name, (uint *)&xport_name_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING; + zend_hash_move_forward_ex(stream_xport_hash, &pos)) { + if (xport_buf_len + xport_name_len + 2 > xport_buf_size) { + while (xport_buf_len + xport_name_len + 2 > xport_buf_size) { + xport_buf_size += 256; + } + if (xport_buf) { + xport_buf = erealloc(xport_buf, xport_buf_size); + } else { + xport_buf = emalloc(xport_buf_size); + } + } + if (xport_buf_len > 0) { + xport_buf[xport_buf_len++] = ','; + xport_buf[xport_buf_len++] = ' '; + } + memcpy(xport_buf + xport_buf_len, xport_name, xport_name_len - 1); + xport_buf_len += xport_name_len - 1; + xport_buf[xport_buf_len] = '\0'; + } + if (xport_buf) { + php_info_print_table_row(2, "Registered Stream Socket Transports", xport_buf); + efree(xport_buf); + } else { + /* Any chances we will ever hit this? */ + php_info_print_table_row(2, "Registered Stream Socket Transports", "no transports registered"); + } + } else { + /* Any chances we will ever hit this? */ + php_info_print_table_row(2, "Stream Socket Transports", "disabled"); /* ?? */ + } + } + + { + HashTable *stream_filter_hash; + char *filter_name, *filter_buf = NULL; + int filter_name_len, filter_buf_len = 0, filter_buf_size = 0; + ulong num_key; + + if ((stream_filter_hash = php_get_stream_filters_hash())) { + HashPosition pos; + for(zend_hash_internal_pointer_reset_ex(stream_filter_hash, &pos); + zend_hash_get_current_key_ex(stream_filter_hash, &filter_name, (uint *)&filter_name_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING; + zend_hash_move_forward_ex(stream_filter_hash, &pos)) { + if (filter_buf_len + filter_name_len + 2 > filter_buf_size) { + while (filter_buf_len + filter_name_len + 2 > filter_buf_size) { + filter_buf_size += 256; + } + if (filter_buf) { + filter_buf = erealloc(filter_buf, filter_buf_size); + } else { + filter_buf = emalloc(filter_buf_size); + } + } + if (filter_buf_len > 0) { + filter_buf[filter_buf_len++] = ','; + filter_buf[filter_buf_len++] = ' '; + } + memcpy(filter_buf + filter_buf_len, filter_name, filter_name_len - 1); + filter_buf_len += filter_name_len - 1; + filter_buf[filter_buf_len] = '\0'; + } + if (filter_buf) { + php_info_print_table_row(2, "Registered Stream Filters", filter_buf); + efree(filter_buf); + } else { + /* Any chances we will ever hit this? */ + php_info_print_table_row(2, "Registered Stream Filters", "no filters registered"); + } + } else { + /* Any chances we will ever hit this? */ + php_info_print_table_row(2, "Stream Filters", "disabled"); /* ?? */ + } + } + php_info_print_table_end(); /* Zend Engine */ php_info_print_box_start(0); if (expose_php && !sapi_module.phpinfo_as_text) { - php_info_print("<a href=\"http://www.zend.com/\"><img border=\"0\" src=\""); - php_info_print_request_uri(TSRMLS_C); - php_info_print("?="ZEND_LOGO_GUID"\" alt=\"Zend logo\" /></a>\n"); + PUTS("<a href=\"http://www.zend.com/\"><img border=\"0\" src=\""); + if (SG(request_info).request_uri) { + char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); + PUTS(elem_esc); + efree(elem_esc); + } + PUTS("?="ZEND_LOGO_GUID"\" alt=\"Zend logo\" /></a>\n"); } - php_info_print("This program makes use of the Zend Scripting Language Engine:"); - php_info_print(!sapi_module.phpinfo_as_text?"<br />":"\n"); + PUTS("This program makes use of the Zend Scripting Language Engine:"); + PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n"); if (sapi_module.phpinfo_as_text) { - php_info_print(zend_version); + PUTS(zend_version); } else { zend_html_puts(zend_version, strlen(zend_version) TSRMLS_CC); } @@ -789,11 +891,15 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if ((flag & PHP_INFO_CREDITS) && expose_php && !sapi_module.phpinfo_as_text) { php_info_print_hr(); - php_info_print("<h1><a href=\""); - php_info_print_request_uri(TSRMLS_C); - php_info_print("?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000\">"); - php_info_print("PHP Credits"); - php_info_print("</a></h1>\n"); + PUTS("<h1><a href=\""); + if (SG(request_info).request_uri) { + char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); + PUTS(elem_esc); + efree(elem_esc); + } + PUTS("?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000\">"); + PUTS("PHP Credits"); + PUTS("</a></h1>\n"); } zend_ini_sort_entries(TSRMLS_C); @@ -801,7 +907,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (flag & PHP_INFO_CONFIGURATION) { php_info_print_hr(); if (!sapi_module.phpinfo_as_text) { - php_info_print("<h1>Configuration</h1>\n"); + PUTS("<h1>Configuration</h1>\n"); } else { SECTION("Configuration"); } @@ -881,108 +987,103 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (!sapi_module.phpinfo_as_text) { SECTION("PHP License"); php_info_print_box_start(0); - php_info_print("<p>\n"); - php_info_print("This program is free software; you can redistribute it and/or modify "); - php_info_print("it under the terms of the PHP License as published by the PHP Group "); - php_info_print("and included in the distribution in the file: LICENSE\n"); - php_info_print("</p>\n"); - php_info_print("<p>"); - php_info_print("This program is distributed in the hope that it will be useful, "); - php_info_print("but WITHOUT ANY WARRANTY; without even the implied warranty of "); - php_info_print("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); - php_info_print("</p>\n"); - php_info_print("<p>"); - php_info_print("If you did not receive a copy of the PHP license, or have any questions about "); - php_info_print("PHP licensing, please contact license@php.net.\n"); - php_info_print("</p>\n"); + PUTS("<p>\n"); + PUTS("This program is free software; you can redistribute it and/or modify "); + PUTS("it under the terms of the PHP License as published by the PHP Group "); + PUTS("and included in the distribution in the file: LICENSE\n"); + PUTS("</p>\n"); + PUTS("<p>"); + PUTS("This program is distributed in the hope that it will be useful, "); + PUTS("but WITHOUT ANY WARRANTY; without even the implied warranty of "); + PUTS("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); + PUTS("</p>\n"); + PUTS("<p>"); + PUTS("If you did not receive a copy of the PHP license, or have any questions about "); + PUTS("PHP licensing, please contact license@php.net.\n"); + PUTS("</p>\n"); php_info_print_box_end(); } else { - php_info_print("\nPHP License\n"); - php_info_print("This program is free software; you can redistribute it and/or modify\n"); - php_info_print("it under the terms of the PHP License as published by the PHP Group\n"); - php_info_print("and included in the distribution in the file: LICENSE\n"); - php_info_print("\n"); - php_info_print("This program is distributed in the hope that it will be useful,\n"); - php_info_print("but WITHOUT ANY WARRANTY; without even the implied warranty of\n"); - php_info_print("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); - php_info_print("\n"); - php_info_print("If you did not receive a copy of the PHP license, or have any\n"); - php_info_print("questions about PHP licensing, please contact license@php.net.\n"); + PUTS("\nPHP License\n"); + PUTS("This program is free software; you can redistribute it and/or modify\n"); + PUTS("it under the terms of the PHP License as published by the PHP Group\n"); + PUTS("and included in the distribution in the file: LICENSE\n"); + PUTS("\n"); + PUTS("This program is distributed in the hope that it will be useful,\n"); + PUTS("but WITHOUT ANY WARRANTY; without even the implied warranty of\n"); + PUTS("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); + PUTS("\n"); + PUTS("If you did not receive a copy of the PHP license, or have any\n"); + PUTS("questions about PHP licensing, please contact license@php.net.\n"); } } if (!sapi_module.phpinfo_as_text) { - php_info_print("</div></body></html>"); + PUTS("</div></body></html>"); } } /* }}} */ -PHPAPI void php_info_print_table_start(void) /* {{{ */ + +PHPAPI void php_info_print_table_start(void) { if (!sapi_module.phpinfo_as_text) { - php_info_print("<table border=\"0\" cellpadding=\"3\" width=\"600\">\n"); + php_printf("<table border=\"0\" cellpadding=\"3\" width=\"600\">\n"); } else { - php_info_print("\n"); + php_printf("\n"); } } -/* }}} */ -PHPAPI void php_info_print_table_end(void) /* {{{ */ +PHPAPI void php_info_print_table_end(void) { if (!sapi_module.phpinfo_as_text) { - php_info_print("</table><br />\n"); + php_printf("</table><br />\n"); } } -/* }}} */ -PHPAPI void php_info_print_box_start(int flag) /* {{{ */ +PHPAPI void php_info_print_box_start(int flag) { php_info_print_table_start(); if (flag) { if (!sapi_module.phpinfo_as_text) { - php_info_print("<tr class=\"h\"><td>\n"); + php_printf("<tr class=\"h\"><td>\n"); } } else { if (!sapi_module.phpinfo_as_text) { - php_info_print("<tr class=\"v\"><td>\n"); + php_printf("<tr class=\"v\"><td>\n"); } else { - php_info_print("\n"); + php_printf("\n"); } } } -/* }}} */ -PHPAPI void php_info_print_box_end(void) /* {{{ */ +PHPAPI void php_info_print_box_end(void) { if (!sapi_module.phpinfo_as_text) { - php_info_print("</td></tr>\n"); + php_printf("</td></tr>\n"); } php_info_print_table_end(); } -/* }}} */ -PHPAPI void php_info_print_hr(void) /* {{{ */ +PHPAPI void php_info_print_hr(void) { if (!sapi_module.phpinfo_as_text) { - php_info_print("<hr />\n"); + php_printf("<hr />\n"); } else { - php_info_print("\n\n _______________________________________________________________________\n\n"); + php_printf("\n\n _______________________________________________________________________\n\n"); } } -/* }}} */ -PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header) /* {{{ */ +PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header) { int spaces; if (!sapi_module.phpinfo_as_text) { - php_info_printf("<tr class=\"h\"><th colspan=\"%d\">%s</th></tr>\n", num_cols, header ); + php_printf("<tr class=\"h\"><th colspan=\"%d\">%s</th></tr>\n", num_cols, header ); } else { spaces = (74 - strlen(header)); - php_info_printf("%*s%s%*s\n", (int)(spaces/2), " ", header, (int)(spaces/2), " "); + php_printf("%*s%s%*s\n", (int)(spaces/2), " ", header, (int)(spaces/2), " "); } } -/* }}} */ /* {{{ php_info_print_table_header */ @@ -992,9 +1093,11 @@ PHPAPI void php_info_print_table_header(int num_cols, ...) va_list row_elements; char *row_element; + TSRMLS_FETCH(); + va_start(row_elements, num_cols); if (!sapi_module.phpinfo_as_text) { - php_info_print("<tr class=\"h\">"); + php_printf("<tr class=\"h\">"); } for (i=0; i<num_cols; i++) { row_element = va_arg(row_elements, char *); @@ -1002,21 +1105,21 @@ PHPAPI void php_info_print_table_header(int num_cols, ...) row_element = " "; } if (!sapi_module.phpinfo_as_text) { - php_info_print("<th>"); - php_info_print(row_element); - php_info_print("</th>"); + PUTS("<th>"); + PUTS(row_element); + PUTS("</th>"); } else { - php_info_print(row_element); + PUTS(row_element); if (i < num_cols-1) { - php_info_print(" => "); + PUTS(" => "); } else { - php_info_print("\n"); - } - } + PUTS("\n"); + } + } } if (!sapi_module.phpinfo_as_text) { - php_info_print("</tr>\n"); - } + php_printf("</tr>\n"); + } va_end(row_elements); } @@ -1029,41 +1132,49 @@ static void php_info_print_table_row_internal(int num_cols, { int i; char *row_element; + char *elem_esc = NULL; +/* + int elem_esc_len; +*/ + + TSRMLS_FETCH(); if (!sapi_module.phpinfo_as_text) { - php_info_print("<tr>"); + php_printf("<tr>"); } for (i=0; i<num_cols; i++) { if (!sapi_module.phpinfo_as_text) { - php_info_printf("<td class=\"%s\">", + php_printf("<td class=\"%s\">", (i==0 ? "e" : value_class ) ); } row_element = va_arg(row_elements, char *); if (!row_element || !*row_element) { if (!sapi_module.phpinfo_as_text) { - php_info_print( "<i>no value</i>" ); + PUTS( "<i>no value</i>" ); } else { - php_info_print( " " ); + PUTS( " " ); } } else { if (!sapi_module.phpinfo_as_text) { - php_info_print_html_esc(row_element, strlen(row_element)); + elem_esc = php_info_html_esc(row_element TSRMLS_CC); + PUTS(elem_esc); + efree(elem_esc); } else { - php_info_print(row_element); + PUTS(row_element); if (i < num_cols-1) { - php_info_print(" => "); + PUTS(" => "); } } } if (!sapi_module.phpinfo_as_text) { - php_info_print(" </td>"); + php_printf(" </td>"); } else if (i == (num_cols - 1)) { - php_info_print("\n"); + PUTS("\n"); } } if (!sapi_module.phpinfo_as_text) { - php_info_print("</tr>\n"); + php_printf("</tr>\n"); } } /* }}} */ @@ -1127,9 +1238,9 @@ PHP_FUNCTION(phpinfo) } /* Andale! Andale! Yee-Hah! */ - php_output_start_default(TSRMLS_C); + php_start_ob_buffer(NULL, 4096, 0 TSRMLS_CC); php_print_info(flag TSRMLS_CC); - php_output_end(TSRMLS_C); + php_end_ob_buffer(1, 0 TSRMLS_CC); RETURN_TRUE; } @@ -1140,18 +1251,20 @@ PHP_FUNCTION(phpinfo) Return the current PHP version */ PHP_FUNCTION(phpversion) { - char *ext_name = NULL; - int ext_name_len = 0; + zval **arg; + const char *version; + int argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ext_name, &ext_name_len) == FAILURE) { - return; - } - - if (!ext_name) { + if (argc == 0) { RETURN_STRING(PHP_VERSION, 1); } else { - const char *version; - version = zend_get_module_version(ext_name); + if (zend_parse_parameters(argc TSRMLS_CC, "Z", &arg) == FAILURE) { + return; + } + + convert_to_string_ex(arg); + version = zend_get_module_version(Z_STRVAL_PP(arg)); + if (version == NULL) { RETURN_FALSE; } @@ -1175,6 +1288,7 @@ PHP_FUNCTION(phpcredits) } /* }}} */ + /* {{{ php_logo_guid */ PHPAPI char *php_logo_guid(void) @@ -1202,6 +1316,7 @@ PHPAPI char *php_logo_guid(void) Return the special ID used to request the PHP logo in phpinfo screens*/ PHP_FUNCTION(php_logo_guid) { + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1214,6 +1329,7 @@ PHP_FUNCTION(php_logo_guid) Return the special ID used to request the PHP logo in phpinfo screens*/ PHP_FUNCTION(php_real_logo_guid) { + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1269,7 +1385,6 @@ PHP_FUNCTION(php_uname) { char *mode = "a"; int modelen = sizeof("a")-1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &mode, &modelen) == FAILURE) { return; } diff --git a/ext/standard/tests/general_functions/ob_get_flush_error.phpt b/ext/standard/tests/general_functions/ob_get_flush_error.phpt index 1d3538120d..db666c5a6a 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt @@ -26,7 +26,5 @@ var_dump( ob_get_flush() ); Warning: ob_get_flush() expects exactly 0 parameters, 1 given in %s on line %d NULL - -Notice: ob_get_flush(): failed to delete and flush buffer. No buffer to delete or flush in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/general_functions/phpinfo.phpt b/ext/standard/tests/general_functions/phpinfo.phpt index 20828f4fcd..7da94c3596 100644 --- a/ext/standard/tests/general_functions/phpinfo.phpt +++ b/ext/standard/tests/general_functions/phpinfo.phpt @@ -37,7 +37,6 @@ Thread Safety => %s Zend Memory Manager => %s Zend Multibyte Support => %s IPv6 Support => %s - Registered PHP Streams => %s Registered Stream Socket Transports => %s Registered Stream Filters => %s diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index c073695dbd..905734918a 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -1,8 +1,8 @@ -/* Generated by re2c 0.13.5 on Tue Dec 8 14:00:51 2009 */ +/* Generated by re2c 0.13.5 on Mon Jul 27 02:20:40 2009 */ #line 1 "ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ - | PHP Version 6 | + | PHP Version 5 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ @@ -993,7 +993,7 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char * size_t len; if (BG(url_adapt_state_ex).url_app.len != 0) { - *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT | PHP_OUTPUT_HANDLER_FLUSH | PHP_OUTPUT_HANDLER_FINAL) ? 1 : 0) TSRMLS_CC); + *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC); if (sizeof(uint) < sizeof(size_t)) { if (len > UINT_MAX) len = UINT_MAX; @@ -1024,15 +1024,11 @@ PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int va char *encoded; int encoded_len; smart_str val; - zval *ob_name; if (! BG(url_adapt_state_ex).active) { - MAKE_STD_ZVAL(ob_name); - ZVAL_STRING(ob_name, "URL-Rewriter", 1); php_url_scanner_ex_activate(TSRMLS_C); - php_output_start_internal(ob_name, php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); + php_ob_set_internal_handler(php_url_scanner_output_handler, 0, "URL-Rewriter", 1 TSRMLS_CC); BG(url_adapt_state_ex).active = 1; - zval_ptr_dtor(&ob_name); } diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index cb248b448f..888bb0667a 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 6 | + | PHP Version 5 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ @@ -431,7 +431,7 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char * size_t len; if (BG(url_adapt_state_ex).url_app.len != 0) { - *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT | PHP_OUTPUT_HANDLER_FLUSH | PHP_OUTPUT_HANDLER_FINAL) ? 1 : 0) TSRMLS_CC); + *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC); if (sizeof(uint) < sizeof(size_t)) { if (len > UINT_MAX) len = UINT_MAX; @@ -462,15 +462,11 @@ PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int va char *encoded; int encoded_len; smart_str val; - zval *ob_name; if (! BG(url_adapt_state_ex).active) { - MAKE_STD_ZVAL(ob_name); - ZVAL_STRING(ob_name, "URL-Rewriter", 1); php_url_scanner_ex_activate(TSRMLS_C); - php_output_start_internal(ob_name, php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); + php_ob_set_internal_handler(php_url_scanner_output_handler, 0, "URL-Rewriter", 1 TSRMLS_CC); BG(url_adapt_state_ex).active = 1; - zval_ptr_dtor(&ob_name); } diff --git a/ext/standard/var.c b/ext/standard/var.c index 8f3381743d..de321060f8 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -453,14 +453,14 @@ PHP_FUNCTION(var_export) } if (return_output) { - php_output_start_default(TSRMLS_C); + php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); } php_var_export(&var, 1 TSRMLS_CC); if (return_output) { - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer (return_value TSRMLS_CC); + php_end_ob_buffer (0, 0 TSRMLS_CC); } } /* }}} */ |