cvs: /php4/sapi/aolserver aolserver.c /php4/sapi/apache php_apache.c

cmv Fri Apr 7 09:47:00 2000 EDT Modified files: /php4/sapi/aolserver aolserver.c /php4/sapi/apache php_apache.c Log: Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.37 php4/sapi/aolserver/aolserver.c:1.38 --- php4/sapi/aolserver/aolserver.c:1.37 Sat Mar 18 09:50:43 2000 +++ php4/sapi/aolserver/aolserver.c Fri Apr 7 09:46:59 2000 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.37 2000/03/18 17:50:43 sas Exp $ */ +/* $Id: aolserver.c,v 1.38 2000/04/07 16:46:59 cmv Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,8 +205,8 @@ int i; NSLS_FETCH(); - PUTS("<table border=5 width=600>\n"); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.37 2000/03/18 17:50:43 sas Exp $"); + php_info_print_table_start(); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.38 2000/04/07 16:46:59 cmv Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -222,24 +222,21 @@ (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); Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.9 php4/sapi/apache/php_apache.c:1.10 --- php4/sapi/apache/php_apache.c:1.9 Fri Apr 7 09:41:19 2000 +++ php4/sapi/apache/php_apache.c Fri Apr 7 09:46:59 2000 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.9 2000/04/07 16:41:19 cmv Exp $ */ +/* $Id: php_apache.c,v 1.10 2000/04/07 16:46:59 cmv Exp $ */ #define NO_REGEX_EXTRA_H @@ -244,8 +244,8 @@ 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_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) {