cvs: php4 /ext/standard info.c /main SAPI.h /sapi/aolserver aolserver.c /sapi/apache mod_php4.c /sapi/cgi cgi_main.c /sapi/isapi php4isapi.c
/sapi/nsapi nsapi.c /sapi/phttpd phttpd.c /sapi/pi3web pi3web_sapi.c /sapi/roxen roxen.c /sapi/servlet servlet.c /sapi/thttpd thttpd.c

andrei Mon Jun 26 11:05:58 2000 EDT Modified files: /php4/ext/standard info.c /php4/main SAPI.h /php4/sapi/aolserver aolserver.c /php4/sapi/apache mod_php4.c /php4/sapi/cgi cgi_main.c /php4/sapi/isapi php4isapi.c /php4/sapi/nsapi nsapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/pi3web pi3web_sapi.c /php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c /php4/sapi/thttpd thttpd.c Log: Separate plain name returned by php_sapi_module() and pretty name used for output. Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.103 php4/ext/standard/info.c:1.104 --- php4/ext/standard/info.c:1.103 Mon Jun 26 07:55:38 2000 +++ php4/ext/standard/info.c Mon Jun 26 11:05:49 2000 @@ -179,8 +179,8 @@ #ifdef CONFIGURE_COMMAND php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); #endif - if (sapi_module.name) { - php_info_print_table_row(2, "Server API", sapi_module.name ); + if (sapi_module.pretty_name) { + php_info_print_table_row(2, "Server API", sapi_module.pretty_name ); } #ifdef VIRTUAL_DIR Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.47 php4/main/SAPI.h:1.48 --- php4/main/SAPI.h:1.47 Thu May 18 08:34:21 2000 +++ php4/main/SAPI.h Mon Jun 26 11:05:49 2000 @@ -148,6 +148,7 @@ struct _sapi_module_struct { char *name; + char *pretty_name; int (*startup)(struct _sapi_module_struct *sapi_module); int (*shutdown)(struct _sapi_module_struct *sapi_module); Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.41 php4/sapi/aolserver/aolserver.c:1.42 --- php4/sapi/aolserver/aolserver.c:1.41 Mon Jun 5 16:21:57 2000 +++ php4/sapi/aolserver/aolserver.c Mon Jun 26 11:05:49 2000 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.41 2000/06/05 23:21:57 sas Exp $ */ +/* $Id: aolserver.c,v 1.42 2000/06/26 18:05:49 andrei Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -207,7 +207,7 @@ NSLS_FETCH(); php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.41 2000/06/05 23:21:57 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.42 2000/06/26 18:05:49 andrei 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()); @@ -290,6 +290,7 @@ /* this structure is static (as in "it does not change") */ static sapi_module_struct sapi_module = { + "aolserver", "AOLserver", php_ns_startup, /* startup */ Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.51 php4/sapi/apache/mod_php4.c:1.52 --- php4/sapi/apache/mod_php4.c:1.51 Mon Jun 5 16:21:57 2000 +++ php4/sapi/apache/mod_php4.c Mon Jun 26 11:05:50 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.51 2000/06/05 23:21:57 sas Exp $ */ +/* $Id: mod_php4.c,v 1.52 2000/06/26 18:05:50 andrei Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -332,7 +332,8 @@ static sapi_module_struct sapi_module = { - "Apache", /* name */ + "apache", /* name */ + "Apache", /* pretty name */ php_apache_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.58 php4/sapi/cgi/cgi_main.c:1.59 --- php4/sapi/cgi/cgi_main.c:1.58 Mon Jun 26 10:57:03 2000 +++ php4/sapi/cgi/cgi_main.c Mon Jun 26 11:05:51 2000 @@ -199,7 +199,8 @@ static sapi_module_struct sapi_module = { - "CGI", /* name */ + "cgi", /* name */ + "CGI", /* pretty name */ php_module_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.46 php4/sapi/isapi/php4isapi.c:1.47 --- php4/sapi/isapi/php4isapi.c:1.46 Fri Jun 16 11:23:57 2000 +++ php4/sapi/isapi/php4isapi.c Mon Jun 26 11:05:51 2000 @@ -383,7 +383,8 @@ static sapi_module_struct sapi_module = { - "ISAPI", /* name */ + "isapi", /* name */ + "ISAPI", /* pretty name */ php_isapi_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ @@ -419,7 +420,7 @@ { bFilterLoaded = 1; pFilterVersion->dwFilterVersion = HTTP_FILTER_REVISION; - strcpy(pFilterVersion->lpszFilterDesc, sapi_module.name); + strcpy(pFilterVersion->lpszFilterDesc, sapi_module.pretty_name); pFilterVersion->dwFlags= (SF_NOTIFY_AUTHENTICATION | SF_NOTIFY_PREPROC_HEADERS); return TRUE; } Index: php4/sapi/nsapi/nsapi.c diff -u php4/sapi/nsapi/nsapi.c:1.8 php4/sapi/nsapi/nsapi.c:1.9 --- php4/sapi/nsapi/nsapi.c:1.8 Sat Jun 24 09:31:10 2000 +++ php4/sapi/nsapi/nsapi.c Mon Jun 26 11:05:52 2000 @@ -322,7 +322,8 @@ } static sapi_module_struct sapi_module = { - "NSAPI", /* name */ + "nsapi", /* name */ + "NSAPI", /* pretty name */ php_module_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ Index: php4/sapi/phttpd/phttpd.c diff -u php4/sapi/phttpd/phttpd.c:1.16 php4/sapi/phttpd/phttpd.c:1.17 --- php4/sapi/phttpd/phttpd.c:1.16 Mon Jun 5 16:21:58 2000 +++ php4/sapi/phttpd/phttpd.c Mon Jun 26 11:05:52 2000 @@ -162,6 +162,7 @@ } static sapi_module_struct sapi_module = { + "phttpd", "PHTTPD", php_phttpd_startup, /* startup */ Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.3 php4/sapi/pi3web/pi3web_sapi.c:1.4 --- php4/sapi/pi3web/pi3web_sapi.c:1.3 Sun Jun 18 12:04:50 2000 +++ php4/sapi/pi3web/pi3web_sapi.c Mon Jun 26 11:05:53 2000 @@ -21,7 +21,7 @@ */ /* -** $Id: pi3web_sapi.c,v 1.3 2000/06/18 19:04:50 holger Exp $ +** $Id: pi3web_sapi.c,v 1.4 2000/06/26 18:05:53 andrei Exp $ */ #if WIN32|WINNT @@ -85,7 +85,7 @@ PUTS("<table border=5 width=600>\n"); PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n"); php_info_print_table_header(2, "Information Field", "Value"); - php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.3 2000/06/18 19:04:50 holger Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.4 2000/06/26 18:05:53 andrei Exp $"); php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp()); snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled()); php_info_print_table_row(2, "Debug Enabled", variable_buf); @@ -283,7 +283,8 @@ static sapi_module_struct sapi_module = { - "PI3WEB", /* name */ + "pi3web", /* name */ + "PI3WEB", /* pretty name */ php_pi3web_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.32 php4/sapi/roxen/roxen.c:1.33 --- php4/sapi/roxen/roxen.c:1.32 Mon Jun 5 17:02:03 2000 +++ php4/sapi/roxen/roxen.c Mon Jun 26 11:05:54 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.32 2000/06/06 00:02:03 neotron Exp $ */ +/* $Id: roxen.c,v 1.33 2000/06/26 18:05:54 andrei Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -447,7 +447,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.32 2000/06/06 00:02:03 neotron Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.33 2000/06/26 18:05:54 andrei 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()); @@ -491,6 +491,7 @@ /* this structure is static (as in "it does not change") */ static sapi_module_struct sapi_module = { + "roxen", "Roxen", php_module_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.32 php4/sapi/servlet/servlet.c:1.33 --- php4/sapi/servlet/servlet.c:1.32 Sat Jun 24 08:31:12 2000 +++ php4/sapi/servlet/servlet.c Mon Jun 26 11:05:55 2000 @@ -217,7 +217,8 @@ */ static sapi_module_struct sapi_module = { - "Java Servlet", /* name */ + "java_servlet", /* name */ + "Java Servlet", /* pretty name */ php_module_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.14 php4/sapi/thttpd/thttpd.c:1.15 --- php4/sapi/thttpd/thttpd.c:1.14 Mon Jun 5 16:21:58 2000 +++ php4/sapi/thttpd/thttpd.c Mon Jun 26 11:05:55 2000 @@ -103,6 +103,7 @@ static sapi_module_struct sapi_module = { "thttpd", + "thttpd", php_module_startup, php_module_shutdown_wrapper,