summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Viebrock <cmv@php.net>2000-04-07 16:46:59 +0000
committerColin Viebrock <cmv@php.net>2000-04-07 16:46:59 +0000
commit86cff779c30cf72355ad77280ba32fc88bb86b04 (patch)
tree6bad6ec9b2155c3cf072c03081096f0fd4972312
parent5628b3f0abd51cd1facd5bbd0f5a68691c5c87e1 (diff)
downloadphp-git-86cff779c30cf72355ad77280ba32fc88bb86b04.tar.gz
*** empty log message ***
-rw-r--r--sapi/aolserver/aolserver.c19
-rw-r--r--sapi/apache/php_apache.c6
2 files changed, 11 insertions, 14 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 0c844d034e..024221809f 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -205,7 +205,7 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
int i;
NSLS_FETCH();
- PUTS("<table border=5 width=600>\n");
+ php_info_print_table_start();
php_info_print_table_row(2, "SAPI module version", "$Id$");
php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
@@ -222,24 +222,21 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
(uptime / 60) % 60,
uptime % 60);
php_info_print_table_row(2, "Server uptime", buf);
- PUTS("</table>");
+ php_info_print_table_end();
- PUTS("<hr><h2>HTTP Headers Information</h2>");
- PUTS("<table border=5 width=\"600\">\n");
- PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">HTTP Request Headers</th></tr>\n");
+ SECTION("HTTP Headers Information");
+ php_info_print_table_start();
+ php_info_print_table_colspan_header(2, "HTTP Request Headers");
php_info_print_table_row(2, "HTTP Request", NSG(conn)->request->line);
-
for (i = 0; i < Ns_SetSize(NSG(conn)->headers); i++) {
php_info_print_table_row(2, Ns_SetKey(NSG(conn)->headers, i), Ns_SetValue(NSG(conn)->headers, i));
}
-
- PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">HTTP Response Headers</th></tr>\n");
-
+
+ php_info_print_table_colspan_header(2, "HTTP Response Headers");
for (i = 0; i < Ns_SetSize(NSG(conn)->outputheaders); i++) {
php_info_print_table_row(2, Ns_SetKey(NSG(conn)->outputheaders, i), Ns_SetValue(NSG(conn)->outputheaders, i));
}
-
- PUTS("</table>");
+ php_info_print_table_end();
}
PHP_FUNCTION(getallheaders);
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index d9b3a1df78..41fc1f924b 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -244,8 +244,8 @@ PHP_MINFO_FUNCTION(apache)
r = ((request_rec *) SG(server_context));
SECTION("HTTP Headers Information");
- php_info_print_table_start();
- PUTS("<TR BGCOLOR=\"" PHP_HEADER_COLOR "\"><TH COLSPAN=2>HTTP Request Headers</TH></TR>\n");
+ php_info_print_table_start();
+ php_info_print_table_colspan_header(2, "HTTP Request Headers");
php_info_print_table_row(2, "HTTP Request", r->the_request);
env_arr = table_elts(r->headers_in);
env = (table_entry *)env_arr->elts;
@@ -254,7 +254,7 @@ PHP_MINFO_FUNCTION(apache)
php_info_print_table_row(2, env[i].key, env[i].val);
}
}
- PUTS("<TR BGCOLOR=\"" PHP_HEADER_COLOR "\"><TH COLSPAN=2>HTTP Response Headers</TH></TR>\n");
+ php_info_print_table_colspan_header(2, "HTTP Response Headers");
env_arr = table_elts(r->headers_out);
env = (table_entry *)env_arr->elts;
for(i = 0; i < env_arr->nelts; ++i) {